From d38e076dbdca0f7e62d8587b10da9a1d44a77760 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Wed, 18 Nov 2009 08:22:44 +0000
Subject: [PATCH] --- yaml --- r: 171624 b: refs/heads/master c:
 c2f379b2f8cf59e6bff4d028949a0273732460aa h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/net/pppol2tp.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc28c23ee191..c42a15a0115d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6cc93183eef9ba0eb6e9989c2e3744904287a95e
+refs/heads/master: c2f379b2f8cf59e6bff4d028949a0273732460aa
diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c
index 442c382c2c85..c58b50f8ba3b 100644
--- a/trunk/drivers/net/pppol2tp.c
+++ b/trunk/drivers/net/pppol2tp.c
@@ -1537,7 +1537,7 @@ static struct sock *pppol2tp_prepare_tunnel_socket(struct net *net,
 	 * if the tunnel socket goes away.
 	 */
 	tunnel->old_sk_destruct = sk->sk_destruct;
-	sk->sk_destruct = &pppol2tp_tunnel_destruct;
+	sk->sk_destruct = pppol2tp_tunnel_destruct;
 
 	tunnel->sock = sk;
 	sk->sk_allocation = GFP_ATOMIC;