From: David S. Miller <davem@davemloft.net>
Date: Fri, 29 Apr 2011 06:50:49 +0000 (-0700)
Subject: ipv4: Get route daddr from flow key in l2tp_ip_connect().
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ad227425c9ca907b5498e2558320b7e585d86ec9;p=linux-beck.git

ipv4: Get route daddr from flow key in l2tp_ip_connect().

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>
---

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index c100fa99cf8e..a4d2dfa1fdbf 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -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;