From 90c67529d5796fc401330536e48d451f30377778 Mon Sep 17 00:00:00 2001
From: Mathias Krause <minipli@googlemail.com>
Date: Wed, 15 Aug 2012 11:31:52 +0000
Subject: [PATCH] --- yaml --- r: 322018 b: refs/heads/master c:
 04d4fbca1017c11381e7d82acea21dd741e748bc h: refs/heads/master 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 fd69009f44b4..9245fb167ffc 100644
--- 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
index 35e1e4bde587..927547171bc7 100644
--- 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;