aboutsummaryrefslogtreecommitdiff
path: root/net/tipc/net.c
diff options
context:
space:
mode:
authorAllan Stephens <allan.stephens@windriver.com>2011-02-25 10:01:58 -0500
committerPaul Gortmaker <paul.gortmaker@windriver.com>2011-03-13 16:35:17 -0400
commitd1bcb11544109114d72965afea7805cc3e16a83a (patch)
treeb530d264ec04c6ac8d61d2b9f44cf2ef07a66d86 /net/tipc/net.c
parent9df3b7eb6ec1c7734482f782bf8335a2737c02f0 (diff)
tipc: Split up unified structure of network-related variables
Converts the fields of the global "tipc_net" structure into individual variables. Since the struct was never referenced as a complete unit, its existence was pointless. This will facilitate upcoming changes to TIPC's node table and simpify upcoming relocation of the variables so they are only visible to the files that actually use them. This change is essentially cosmetic in nature, and doesn't affect the operation of TIPC. Signed-off-by: Allan Stephens <allan.stephens@windriver.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r--net/tipc/net.c22
1 files changed, 12 insertions, 10 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index dd78d869829..f6303d79f7f 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -108,26 +108,28 @@
*/
DEFINE_RWLOCK(tipc_net_lock);
-struct network tipc_net;
+struct tipc_node **tipc_nodes;
+u32 tipc_highest_node;
+atomic_t tipc_num_links;
static int net_start(void)
{
- tipc_net.nodes = kcalloc(tipc_max_nodes + 1,
- sizeof(*tipc_net.nodes), GFP_ATOMIC);
- tipc_net.highest_node = 0;
- atomic_set(&tipc_net.links, 0);
+ tipc_nodes = kcalloc(tipc_max_nodes + 1,
+ sizeof(*tipc_nodes), GFP_ATOMIC);
+ tipc_highest_node = 0;
+ atomic_set(&tipc_num_links, 0);
- return tipc_net.nodes ? 0 : -ENOMEM;
+ return tipc_nodes ? 0 : -ENOMEM;
}
static void net_stop(void)
{
u32 n_num;
- for (n_num = 1; n_num <= tipc_net.highest_node; n_num++)
- tipc_node_delete(tipc_net.nodes[n_num]);
- kfree(tipc_net.nodes);
- tipc_net.nodes = NULL;
+ for (n_num = 1; n_num <= tipc_highest_node; n_num++)
+ tipc_node_delete(tipc_nodes[n_num]);
+ kfree(tipc_nodes);
+ tipc_nodes = NULL;
}
static void net_route_named_msg(struct sk_buff *buf)