---

yaml --- r: 291627 b: refs/heads/master c: bbdb32c h: refs/heads/master i: 291625: 6a9b4a0 291623: f96975d v: v3
git-mirror · Mar 20, 2012 · 12abf92 · 12abf92
1 parent 619ffea
commit 12abf92
Show file tree

Hide file tree

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