diff options
author | Allan Stephens <allan.stephens@windriver.com> | 2011-11-08 13:48:28 -0500 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-24 17:05:17 -0500 |
commit | b58343f9ea75f02ef48b984767511c6b3ba76eaf (patch) | |
tree | 9569124c832d5ff91f4a2191a13f31ac8c59f0d7 /net/tipc/node.c | |
parent | 077a26f029e76a5918edf9c1d44d5566eec719fc (diff) |
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: Allan Stephens <allan.stephens@windriver.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/node.c')
-rw-r--r-- | net/tipc/node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/node.c b/net/tipc/node.c index 12ddc6581572..a34cabc2c43a 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c | |||
@@ -406,7 +406,7 @@ struct sk_buff *tipc_node_get_links(const void *req_tlv_area, int req_tlv_space) | |||
406 | return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE | 406 | return tipc_cfg_reply_error_string(TIPC_CFG_INVALID_VALUE |
407 | " (network address)"); | 407 | " (network address)"); |
408 | 408 | ||
409 | if (tipc_mode != TIPC_NET_MODE) | 409 | if (!tipc_own_addr) |
410 | return tipc_cfg_reply_none(); | 410 | return tipc_cfg_reply_none(); |
411 | 411 | ||
412 | read_lock_bh(&tipc_net_lock); | 412 | read_lock_bh(&tipc_net_lock); |