3 files changed, 4 insertions, 15 deletions

diff --git a/net/tipc/config.c b/net/tipc/config.c
index 69cca4f67e8e..7ca3854a2ac8 100644
--- a/net/tipc/config.c
+++ b/net/tipc/config.c
@@ -252,11 +252,8 @@ static struct sk_buff *cfg_set_max_ports(void)
         if (value < 127 || value > 65535)
                 return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE
                                                    " (max ports must be 127-65535)");
-        if (tipc_mode != TIPC_NOT_RUNNING)
-                return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
-                        " (cannot change max ports while TIPC is active)");
-        tipc_max_ports = value;
-        return tipc_cfg_reply_none();
+        return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED
+                " (cannot change max ports while TIPC is active)");
 }
 
 static struct sk_buff *cfg_set_netid(void)
diff --git a/net/tipc/core.c b/net/tipc/core.c
index 2691cd57b8a8..ec381d444bc3 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -53,7 +53,7 @@
 
 /* global variables used by multiple sub-systems within TIPC */
 
-int tipc_mode = TIPC_NOT_RUNNING;
+int tipc_mode;
 int tipc_random;
 
 const char tipc_alphabet[] =
@@ -125,11 +125,6 @@ int tipc_core_start_net(unsigned long addr)
 
 static void tipc_core_stop(void)
 {
-        if (tipc_mode != TIPC_NODE_MODE)
-                return;
-
-        tipc_mode = TIPC_NOT_RUNNING;
-
         tipc_netlink_stop();
         tipc_handler_stop();
         tipc_cfg_stop();
@@ -148,9 +143,6 @@ static int tipc_core_start(void)
 {
         int res;
 
-        if (tipc_mode != TIPC_NOT_RUNNING)
-                return -ENOPROTOOPT;
-
         get_random_bytes(&tipc_random, sizeof(tipc_random));
         tipc_mode = TIPC_NODE_MODE;
 
diff --git a/net/tipc/core.h b/net/tipc/core.h
index aefe1869572e..9842ec08dd5c 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -132,7 +132,7 @@ void tipc_msg_dbg(struct print_buf *, struct tipc_msg *, const char *);
 /*
  * TIPC operating mode routines
  */
-#define TIPC_NOT_RUNNING  0
+
 #define TIPC_NODE_MODE    1
 #define TIPC_NET_MODE     2