diff options
| author | David S. Miller <davem@davemloft.net> | 2011-04-28 23:50:49 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-04-28 23:50:49 -0700 |
| commit | ad227425c9ca907b5498e2558320b7e585d86ec9 (patch) | |
| tree | 84ef96e5fe88f08b8fbce7194213021b6291fa8e /net/l2tp | |
| parent | d4fb3d74d7a17833de2ba8cbd4f029b30feb4825 (diff) | |
| download | linux-3.10-ad227425c9ca907b5498e2558320b7e585d86ec9.tar.gz linux-3.10-ad227425c9ca907b5498e2558320b7e585d86ec9.tar.bz2 linux-3.10-ad227425c9ca907b5498e2558320b7e585d86ec9.zip | |
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>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_ip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c index c100fa99cf8..a4d2dfa1fdb 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; |