---

yaml --- r: 322018 b: refs/heads/master c: 04d4fbc h: refs/heads/master v: v3
git-mirror · Aug 16, 2012 · 90c6752 · 90c6752
1 parent 2c07bfc
commit 90c6752
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: 792039c73cf176c8e39a6e8beef2c94ff46522ed
+refs/heads/master: 04d4fbca1017c11381e7d82acea21dd741e748bc
diff --git a/trunk/net/l2tp/l2tp_ip6.c b/trunk/net/l2tp/l2tp_ip6.c
@@ -410,6 +410,7 @@ static int l2tp_ip6_getname(struct socket *sock, struct sockaddr *uaddr,
 	lsa->l2tp_family = AF_INET6;
 	lsa->l2tp_flowinfo = 0;
 	lsa->l2tp_scope_id = 0;
+	lsa->l2tp_unused = 0;
 	if (peer) {
 		if (!lsk->peer_conn_id)
 			return -ENOTCONN;