Skip to content

Commit

Permalink
ipv4: Fetch route saddr from flow key in l2tp_ip_connect().
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David S. Miller committed Apr 29, 2011
1 parent 4071cff commit 4490166
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/l2tp/l2tp_ip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4490166

Please sign in to comment.