From e0026ec9f82642b0c727e04c920b0cc0ecda5ace Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 28 Apr 2011 23:17:58 -0700
Subject: [PATCH] --- yaml --- r: 247025 b: refs/heads/master c:
 44901666a1a736b3f43eac7894b07183f127e9a9 h: refs/heads/master i:   247023:
 8cd3a2f1d80efc1bf6efe8d136feb2d0ca8c1efb v: v3

---
 [refs]                   | 2 +-
 trunk/net/l2tp/l2tp_ip.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c81ae39f651d..ebc506b32473 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4071cfff84c5b084762fe288781cd7faab14cb4b
+refs/heads/master: 44901666a1a736b3f43eac7894b07183f127e9a9
diff --git a/trunk/net/l2tp/l2tp_ip.c b/trunk/net/l2tp/l2tp_ip.c
index e13c166824e0..c100fa99cf8e 100644
--- a/trunk/net/l2tp/l2tp_ip.c
+++ b/trunk/net/l2tp/l2tp_ip.c
@@ -340,9 +340,9 @@ static int l2tp_ip_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len
 	l2tp_ip_sk(sk)->peer_conn_id = lsa->l2tp_conn_id;
 
 	if (!inet->inet_saddr)
-		inet->inet_saddr = rt->rt_src;
+		inet->inet_saddr = fl4.saddr;
 	if (!inet->inet_rcv_saddr)
-		inet->inet_rcv_saddr = rt->rt_src;
+		inet->inet_rcv_saddr = fl4.saddr;
 	inet->inet_daddr = rt->rt_dst;
 	sk->sk_state = TCP_ESTABLISHED;
 	inet->inet_id = jiffies;