Skip to content

Commit

Permalink
tipc: Eliminate obsolete support for "not running" mode
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
ajstephens authored and Paul Gortmaker committed Feb 24, 2012
1 parent bc9f814 commit 077a26f
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 15 deletions.
7 changes: 2 additions & 5 deletions net/tipc/config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 1 addition & 9 deletions net/tipc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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[] =
Expand Down Expand Up @@ -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();
Expand All @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion net/tipc/core.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 077a26f

Please sign in to comment.