Commit b58343f9 authored by Allan Stephens's avatar Allan Stephens Committed by Paul Gortmaker
Browse files

tipc: Eliminate support for tipc_mode global variable 



Removes all references to the global variable that records whether
TIPC is running in "single node" mode or "network" mode, since this
information can be easily deduced from the global variable that
records TIPC's network address. (i.e. a non-zero network address
means that TIPC is running in network mode.)

The changes made update most existing mode-based checks to use the
network address global variable. A few checks that are no longer
needed are removed entirely, along with any associated code lying on
non-executable control paths.

Signed-off-by: default avatarAllan Stephens <allan.stephens@windriver.com>
Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
parent 077a26f0

net/tipc/bearer.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int tipc_enable_bearer(const char *name, u32 disc_domain, u32 priority) 
	u32 i;

	int res = -EINVAL;



	if (tipc_mode != TIPC_NET_MODE) {

	if (!tipc_own_addr) {

		warn("Bearer <%s> rejected, not supported in standalone mode\n",

		     name);

		return -ENOPROTOOPT;

net/tipc/config.c

+2 −2
Original line number Diff line number Diff line
@@ -179,7 +179,7 @@ static struct sk_buff *cfg_set_own_addr(void) 
	if (!tipc_addr_node_valid(addr))

		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE

						   " (node address)");

	if (tipc_mode == TIPC_NET_MODE)

	if (tipc_own_addr)

		return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED

						   " (cannot change node address once assigned)");
@@ -268,7 +268,7 @@ static struct sk_buff *cfg_set_netid(void) 
	if (value < 1 || value > 9999)

		return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE

						   " (network id must be 1-9999)");

	if (tipc_mode == TIPC_NET_MODE)

	if (tipc_own_addr)

		return tipc_cfg_reply_error_string(TIPC_CFG_NOT_SUPPORTED

			" (cannot change network id once TIPC has joined a network)");

	tipc_net_id = value;

net/tipc/core.c

+0 −2
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ 


/* global variables used by multiple sub-systems within TIPC */



int tipc_mode;

int tipc_random;



const char tipc_alphabet[] =
@@ -144,7 +143,6 @@ static int tipc_core_start(void) 
	int res;



	get_random_bytes(&tipc_random, sizeof(tipc_random));

	tipc_mode = TIPC_NODE_MODE;



	res = tipc_handler_start();

	if (!res)

net/tipc/core.h

+0 −8
Original line number Diff line number Diff line
@@ -129,13 +129,6 @@ void tipc_msg_dbg(struct print_buf *, struct tipc_msg *, const char *); 


#define ELINKCONG EAGAIN	/* link congestion <=> resource unavailable */



/*

 * TIPC operating mode routines

 */



#define TIPC_NODE_MODE    1

#define TIPC_NET_MODE     2



/*

 * Global configuration variables

 */
@@ -151,7 +144,6 @@ extern int tipc_remote_management; 
 * Other global variables

 */



extern int tipc_mode;

extern int tipc_random;

extern const char tipc_alphabet[];

net/tipc/net.c

+1 −6
Original line number Diff line number Diff line
@@ -175,14 +175,10 @@ int tipc_net_start(u32 addr) 
{

	char addr_string[16];



	if (tipc_mode != TIPC_NODE_MODE)

		return -ENOPROTOOPT;



	tipc_subscr_stop();

	tipc_cfg_stop();



	tipc_own_addr = addr;

	tipc_mode = TIPC_NET_MODE;

	tipc_named_reinit();

	tipc_port_reinit();
@@ -201,10 +197,9 @@ 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_mode = TIPC_NODE_MODE;

	tipc_bearer_stop();

	tipc_bclink_stop();

	list_for_each_entry_safe(node, t_node, &tipc_node_list, list)

CRA Git | Maintained and supported by SUSTech CRA and CCSE