1 files changed, 3 insertions, 8 deletions

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 61afee7e8291..d4531b07076c 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -117,7 +117,7 @@ static void net_route_named_msg(struct sk_buff *buf)
         u32 dport;
 
         if (!msg_named(msg)) {
-                buf_discard(buf);
+                kfree_skb(buf);
                 return;
         }
 
@@ -161,7 +161,7 @@ void tipc_net_route_msg(struct sk_buff *buf)
                         tipc_port_recv_proto_msg(buf);
                         break;
                 default:
-                        buf_discard(buf);
+                        kfree_skb(buf);
                 }
                 return;
         }
@@ -175,14 +175,10 @@ int tipc_net_start(u32 addr)
 {
         char addr_string[16];
 
-        if (tipc_mode != TIPC_NODE_MODE)
-                return -ENOPROTOOPT;
-
         tipc_subscr_stop();
         tipc_cfg_stop();
 
         tipc_own_addr = addr;
-        tipc_mode = TIPC_NET_MODE;
         tipc_named_reinit();
         tipc_port_reinit();
 
@@ -201,10 +197,9 @@ void tipc_net_stop(void)
 {
         struct tipc_node *node, *t_node;
 
-        if (tipc_mode != TIPC_NET_MODE)
+        if (!tipc_own_addr)
                 return;
         write_lock_bh(&tipc_net_lock);
-        tipc_mode = TIPC_NODE_MODE;
         tipc_bearer_stop();
         tipc_bclink_stop();
         list_for_each_entry_safe(node, t_node, &tipc_node_list, list)