1 files changed, 4 insertions, 6 deletions

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index f485600c4507..46b6ed534ef2 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -41,6 +41,7 @@
 #include "link.h"
 #include "name_distr.h"
 #include "socket.h"
+#include "bcast.h"
 
 #define SS_LISTENING            -1      /* socket is listening */
 #define SS_READY                -2      /* socket is connectionless */
@@ -342,7 +343,7 @@ static int tipc_sk_create(struct net *net, struct socket *sock,
         }
 
         /* Allocate socket's protocol area */
-        sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto);
+        sk = sk_alloc(net, AF_TIPC, GFP_KERNEL, &tipc_proto, kern);
         if (sk == NULL)
                 return -ENOMEM;
 
@@ -409,7 +410,7 @@ static int tipc_release(struct socket *sock)
         struct net *net;
         struct tipc_sock *tsk;
         struct sk_buff *skb;
-        u32 dnode, probing_state;
+        u32 dnode;
 
         /*
          * Exit if socket isn't fully initialized (occurs when a failed accept()
@@ -447,10 +448,7 @@ static int tipc_release(struct socket *sock)
         }
 
         tipc_sk_withdraw(tsk, 0, NULL);
-        probing_state = tsk->probing_state;
-        if (del_timer_sync(&sk->sk_timer) &&
-            probing_state != TIPC_CONN_PROBING)
-                sock_put(sk);
+        sk_stop_timer(sk, &sk->sk_timer);
         tipc_sk_remove(tsk);
         if (tsk->connected) {
                 skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE,