From f406a4a0e3eda66c10c9b3434c9753fc208c9bfe Mon Sep 17 00:00:00 2001
From: Florian Westphal <fw@strlen.de>
Date: Fri, 25 Nov 2011 06:47:16 +0000
Subject: [PATCH] --- yaml --- r: 276237 b: refs/heads/master c:
 71b1391a41289735676be02e35239e5aa9fe6ba6 h: refs/heads/master i:   276235:
 e3eb83c7d0e4182b7f32f742d1bf61a338300fd0 v: v3

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

diff --git a/[refs] b/[refs]
index a0a79b62ef6d..6d48949794d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a6e77d5209e459a9ec5c268c39800c06cd1dc86
+refs/heads/master: 71b1391a41289735676be02e35239e5aa9fe6ba6
diff --git a/trunk/net/l2tp/l2tp_core.c b/trunk/net/l2tp/l2tp_core.c
index cf0f308abf5e..89ff8c67943e 100644
--- a/trunk/net/l2tp/l2tp_core.c
+++ b/trunk/net/l2tp/l2tp_core.c
@@ -1072,7 +1072,7 @@ int l2tp_xmit_skb(struct l2tp_session *session, struct sk_buff *skb, int hdr_len
 
 	/* Get routing info from the tunnel socket */
 	skb_dst_drop(skb);
-	skb_dst_set(skb, dst_clone(__sk_dst_get(sk)));
+	skb_dst_set(skb, dst_clone(__sk_dst_check(sk, 0)));
 
 	inet = inet_sk(sk);
 	fl = &inet->cork.fl;