diff options
| author | Ying Xue <ying.xue@windriver.com> | 2015-01-09 15:27:10 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-12 16:24:33 -0500 |
| commit | 347475395434abb2b61bf59c2952470f37072567 (patch) | |
| tree | 71a5f63547edecee31f557d0bacbf993b953a099 /net/tipc/core.h | |
| parent | 4ac1c8d0ee9faf3a4be185cc4db1381fa0d81280 (diff) | |
| download | linux-stable-347475395434abb2b61bf59c2952470f37072567.tar.gz linux-stable-347475395434abb2b61bf59c2952470f37072567.tar.bz2 linux-stable-347475395434abb2b61bf59c2952470f37072567.zip | |
tipc: make tipc node address support net namespace
If net namespace is supported in tipc, each namespace will be treated
as a separate tipc node. Therefore, every namespace must own its
private tipc node address. This means the "tipc_own_addr" global
variable of node address must be moved to tipc_net structure to
satisfy the requirement. It's turned out that users also can assign
node address for every namespace.
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.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 893992944570..afabf39e801c 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -72,10 +72,6 @@ int tipc_snprintf(char *buf, int len, const char *fmt, ...); -/* - * Global configuration variables - */ -extern u32 tipc_own_addr __read_mostly; extern int tipc_net_id __read_mostly; extern int sysctl_tipc_rmem[3] __read_mostly; extern int sysctl_tipc_named_timeout __read_mostly; @@ -86,6 +82,7 @@ extern int sysctl_tipc_named_timeout __read_mostly; extern int tipc_random __read_mostly; struct tipc_net { + u32 own_addr; int net_id; /* Node table and node list */ |