]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
ipv4: Get route daddr from flow key in l2tp_ip_connect().
authorDavid S. Miller <davem@davemloft.net>
Fri, 29 Apr 2011 06:50:49 +0000 (23:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 29 Apr 2011 06:50:49 +0000 (23:50 -0700)
Now that output route lookups update the flow with
destination address selection, we can fetch it from
fl4->daddr instead of rt->rt_dst

Signed-off-by: David S. Miller <davem@davemloft.net>
net/l2tp/l2tp_ip.c

index c100fa99cf8e21165b79ec9468afc2bd64227ae3..a4d2dfa1fdbfc8b021a5582ea8021b2ce0972791 100644 (file)
@@ -343,7 +343,7 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
                inet->inet_saddr = fl4.saddr;
        if (!inet->inet_rcv_saddr)
                inet->inet_rcv_saddr = fl4.saddr;
-       inet->inet_daddr = rt->rt_dst;
+       inet->inet_daddr = fl4.daddr;
        sk->sk_state = TCP_ESTABLISHED;
        inet->inet_id = jiffies;