summaryrefslogtreecommitdiffstats
path: root/net/tipc/core.h
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 15:27:12 +0800
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:33 -0500
commitbafa29e34185fb70496bfd604dc9e4071049f023 (patch)
treead8c2ab58340a54061d7ddb3735f9bd72ea704b0 /net/tipc/core.h
parenta62fbccecd62bacb4416fc427239f5b43b25d05e (diff)
downloadlinux-bafa29e34185fb70496bfd604dc9e4071049f023.tar.bz2
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;
extern int sysctl_tipc_rmem[3] __read_mostly;
extern int sysctl_tipc_named_timeout __read_mostly;
-/*
- * Other global variables
- */
-extern int tipc_random __read_mostly;
-
struct tipc_net {
u32 own_addr;
int net_id;
+ int random;
/* Node table and node list */
spinlock_t node_list_lock;