aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/core.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 02:27:12 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:33 -0500
commitbafa29e34185fb70496bfd604dc9e4071049f023 (patch)
treead8c2ab58340a54061d7ddb3735f9bd72ea704b0 /net/tipc/core.h
parenta62fbccecd62bacb4416fc427239f5b43b25d05e (diff)
tipc: make tipc random value aware of net namespace
After namespace is supported, each namespace should own its private random value. So the global variable representing the random value must be moved to tipc_net structure. Signed-off-by: Ying Xue <ying.xue@windriver.com> Tested-by: Tero Aho <Tero.Aho@coriant.com> Reviewed-by: Jon Maloy <jon.maloy@ericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/tipc/core.h')
-rw-r--r--net/tipc/core.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h
index 639f562dddf3..817b2e9d4227 100644
--- a/net/tipc/core.h
+++ b/net/tipc/core.h
@@ -76,14 +76,10 @@ extern int tipc_net_id __read_mostly;
76extern int sysctl_tipc_rmem[3] __read_mostly; 76extern int sysctl_tipc_rmem[3] __read_mostly;
77extern int sysctl_tipc_named_timeout __read_mostly; 77extern int sysctl_tipc_named_timeout __read_mostly;
78 78
79/*
80 * Other global variables
81 */
82extern int tipc_random __read_mostly;
83
84struct tipc_net { 79struct tipc_net {
85 u32 own_addr; 80 u32 own_addr;
86 int net_id; 81 int net_id;
82 int random;
87 83
88 /* Node table and node list */ 84 /* Node table and node list */
89 spinlock_t node_list_lock; 85 spinlock_t node_list_lock;