1 files changed, 3 insertions, 7 deletions

diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
index ff61124fdf59..3428fba6f2b7 100644
--- a/net/l2tp/l2tp_ip.c
+++ b/net/l2tp/l2tp_ip.c
@@ -234,17 +234,13 @@ static void l2tp_ip_close(struct sock *sk, long timeout)
 static void l2tp_ip_destroy_sock(struct sock *sk)
 {
         struct sk_buff *skb;
-        struct l2tp_tunnel *tunnel = l2tp_sock_to_tunnel(sk);
+        struct l2tp_tunnel *tunnel = sk->sk_user_data;
 
         while ((skb = __skb_dequeue_tail(&sk->sk_write_queue)) != NULL)
                 kfree_skb(skb);
 
-        if (tunnel) {
-                l2tp_tunnel_closeall(tunnel);
-                sock_put(sk);
-        }
-
-        sk_refcnt_debug_dec(sk);
+        if (tunnel)
+                l2tp_tunnel_delete(tunnel);
 }
 
 static int l2tp_ip_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)