1 files changed, 11 insertions, 33 deletions

diff --git a/net/tipc/net.c b/net/tipc/net.c
index 68b3dd637291..5b5cea259caf 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;
         }
 
@@ -141,17 +141,6 @@ void tipc_net_route_msg(struct sk_buff *buf)
                 return;
         msg = buf_msg(buf);
 
-        msg_incr_reroute_cnt(msg);
-        if (msg_reroute_cnt(msg) > 6) {
-                if (msg_errcode(msg)) {
-                        buf_discard(buf);
-                } else {
-                        tipc_reject_msg(buf, msg_destport(msg) ?
-                                        TIPC_ERR_NO_PORT : TIPC_ERR_NO_NAME);
-                }
-                return;
-        }
-
         /* Handle message for this node */
         dnode = msg_short(msg) ? tipc_own_addr : msg_destnode(msg);
         if (tipc_in_scope(dnode, tipc_own_addr)) {
@@ -172,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;
         }
@@ -185,29 +174,19 @@ void tipc_net_route_msg(struct sk_buff *buf)
 int tipc_net_start(u32 addr)
 {
         char addr_string[16];
-        int res;
-
-        if (tipc_mode != TIPC_NODE_MODE)
-                return -ENOPROTOOPT;
-
-        tipc_subscr_stop();
-        tipc_cfg_stop();
 
+        write_lock_bh(&tipc_net_lock);
         tipc_own_addr = addr;
-        tipc_mode = TIPC_NET_MODE;
         tipc_named_reinit();
         tipc_port_reinit();
+        tipc_bclink_init();
+        write_unlock_bh(&tipc_net_lock);
 
-        res = tipc_bclink_init();
-        if (res)
-                return res;
-
-        tipc_k_signal((Handler)tipc_subscr_start, 0);
-        tipc_k_signal((Handler)tipc_cfg_init, 0);
+        tipc_cfg_reinit();
 
-        info("Started in network mode\n");
-        info("Own node address %s, network identity %u\n",
-             tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
+        pr_info("Started in network mode\n");
+        pr_info("Own node address %s, network identity %u\n",
+                tipc_addr_string_fill(addr_string, tipc_own_addr), tipc_net_id);
         return 0;
 }
 
@@ -215,14 +194,13 @@ 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_bearer_stop();
-        tipc_mode = TIPC_NODE_MODE;
         tipc_bclink_stop();
         list_for_each_entry_safe(node, t_node, &tipc_node_list, list)
                 tipc_node_delete(node);
         write_unlock_bh(&tipc_net_lock);
-        info("Left network mode\n");
+        pr_info("Left network mode\n");
 }