aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-11-08 13:18:59 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2012-02-24 17:05:17 -0500
commit077a26f029e76a5918edf9c1d44d5566eec719fc (patch)
tree2c63ca4a3f2a8d880c470b22a0ff9eb5e93f8464 /net/tipc/core.c
parentbc9f8143ecf96c17a56635d2ef4c3c6b6ec27947 (diff)
tipc: Eliminate obsolete support for "not running" mode
Removes all references to TIPC's "not running" mode, since the removal of support for the native API means that there is no longer any way to interact with TIPC if it has not been initialized. The changes made consist of removing mode-based checks that are no longer needed, along with any associated code lying on non-executable control paths. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/core.c')
-rw-r--r--net/tipc/core.c10
1 files changed, 1 insertions, 9 deletions
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 @@
53 53
54/* global variables used by multiple sub-systems within TIPC */ 54/* global variables used by multiple sub-systems within TIPC */
55 55
56int tipc_mode = TIPC_NOT_RUNNING; 56int tipc_mode;
57int tipc_random; 57int tipc_random;
58 58
59const char tipc_alphabet[] = 59const char tipc_alphabet[] =
@@ -125,11 +125,6 @@ int tipc_core_start_net(unsigned long addr)
125 125
126static void tipc_core_stop(void) 126static void tipc_core_stop(void)
127{ 127{
128 if (tipc_mode != TIPC_NODE_MODE)
129 return;
130
131 tipc_mode = TIPC_NOT_RUNNING;
132
133 tipc_netlink_stop(); 128 tipc_netlink_stop();
134 tipc_handler_stop(); 129 tipc_handler_stop();
135 tipc_cfg_stop(); 130 tipc_cfg_stop();
@@ -148,9 +143,6 @@ static int tipc_core_start(void)
148{ 143{
149 int res; 144 int res;
150 145
151 if (tipc_mode != TIPC_NOT_RUNNING)
152 return -ENOPROTOOPT;
153
154 get_random_bytes(&tipc_random, sizeof(tipc_random)); 146 get_random_bytes(&tipc_random, sizeof(tipc_random));
155 tipc_mode = TIPC_NODE_MODE; 147 tipc_mode = TIPC_NODE_MODE;
156 148