---

yaml --- r: 362379 b: refs/heads/master c: b860d3c h: refs/heads/master i: 362377: e68c565 362375: 1001fdd v: v3
git-mirror · Apr 7, 2013 · 032faa9 · 032faa9
1 parent 68abc8d
commit 032faa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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;
 	}