diff --git a/[refs] b/[refs]
index a4b36fe130e5..411c9a4354c4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6506e1486181975d318344143aca722b2b91621
+refs/heads/master: bbdb32cb5b73597386913d052165423b9d736145
diff --git a/trunk/net/l2tp/l2tp_ppp.c b/trunk/net/l2tp/l2tp_ppp.c
index 96bc7a67585a..9b071910b4ba 100644
--- a/trunk/net/l2tp/l2tp_ppp.c
+++ b/trunk/net/l2tp/l2tp_ppp.c
@@ -915,7 +915,7 @@ static int pppol2tp_getname(struct socket *sock, struct sockaddr *uaddr,
 		goto end_put_sess;
 	}
 
-	inet = inet_sk(sk);
+	inet = inet_sk(tunnel->sock);
 	if (tunnel->version == 2) {
 		struct sockaddr_pppol2tp sp;
 		len = sizeof(sp);