summaryrefslogtreecommitdiffstats
path: root/net/l2tp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-04-28 23:17:58 -0700
committerDavid S. Miller <davem@davemloft.net>2011-04-28 23:17:58 -0700
commit44901666a1a736b3f43eac7894b07183f127e9a9 (patch)
tree96d8e36a7286a1732f3c325c96d65b03443634de /net/l2tp
parent4071cfff84c5b084762fe288781cd7faab14cb4b (diff)
downloadop-kernel-dev-44901666a1a736b3f43eac7894b07183f127e9a9.zip
op-kernel-dev-44901666a1a736b3f43eac7894b07183f127e9a9.tar.gz
ipv4: Fetch route saddr from flow key in l2tp_ip_connect().
Now that output route lookups update the flow with source address selection, we can fetch it from fl4->saddr instead of rt->rt_src Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
-rw-r--r--net/l2tp/l2tp_ip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index e13c166..c100fa9 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/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;
OpenPOWER on IntegriCloud