From 093a10a93ee1a0019151bf17673e5e0cfb1e26e2 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Thu, 28 Apr 2011 23:50:49 -0700 Subject: [PATCH] --- yaml --- r: 247030 b: refs/heads/master c: ad227425c9ca907b5498e2558320b7e585d86ec9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/l2tp/l2tp_ip.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 839fbabd357b..b0e8bac083fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4fb3d74d7a17833de2ba8cbd4f029b30feb4825 +refs/heads/master: ad227425c9ca907b5498e2558320b7e585d86ec9 diff --git a/trunk/net/l2tp/l2tp_ip.c b/trunk/net/l2tp/l2tp_ip.c index c100fa99cf8e..a4d2dfa1fdbf 100644 --- a/trunk/net/l2tp/l2tp_ip.c +++ b/trunk/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;