diff options
| author | Allan Stephens <allan.stephens@windriver.com> | 2011-11-08 18:18:59 (GMT) |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-24 22:05:17 (GMT) |
| commit | 077a26f029e76a5918edf9c1d44d5566eec719fc (patch) | |
| tree | 2c63ca4a3f2a8d880c470b22a0ff9eb5e93f8464 /net/tipc/core.c | |
| parent | bc9f8143ecf96c17a56635d2ef4c3c6b6ec27947 (diff) | |
| download | linux-077a26f029e76a5918edf9c1d44d5566eec719fc.tar.xz | |
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.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 2691cd5..ec381d4 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; |