From 032faa9ddf7087d2ddb8e6544eaf2e00ed0db6fc Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Sun, 7 Apr 2013 01:51:55 +0000
Subject: [PATCH] --- yaml --- r: 362379 b: refs/heads/master c:
 b860d3cc62877fad02863e2a08efff69a19382d2 h: refs/heads/master i:   362377:
 e68c565ee5a326c2165b4c241fe67215e90ceeb6   362375:
 1001fdd52086f4d924390d9ae0fb29bad66e88c1 v: v3

---
 [refs]                    | 2 +-
 trunk/net/l2tp/l2tp_ip6.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5abd53893906..143a4c9640e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5598bd9c087dc0efc250a5221e5d0e6f584ee88
+refs/heads/master: b860d3cc62877fad02863e2a08efff69a19382d2
diff --git a/trunk/net/l2tp/l2tp_ip6.c b/trunk/net/l2tp/l2tp_ip6.c
index c74f5a91ff6a..b8a6039314e8 100644
--- a/trunk/net/l2tp/l2tp_ip6.c
+++ b/trunk/net/l2tp/l2tp_ip6.c
@@ -690,6 +690,7 @@ static int l2tp_ip6_recvmsg(struct kiocb *iocb, struct sock *sk,
 		lsa->l2tp_addr = ipv6_hdr(skb)->saddr;
 		lsa->l2tp_flowinfo = 0;
 		lsa->l2tp_scope_id = 0;
+		lsa->l2tp_conn_id = 0;
 		if (ipv6_addr_type(&lsa->l2tp_addr) & IPV6_ADDR_LINKLOCAL)
 			lsa->l2tp_scope_id = IP6CB(skb)->iif;
 	}