diff options
author | Ying Xue <ying.xue@windriver.com> | 2015-01-09 02:27:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-01-12 16:24:33 -0500 |
commit | 1da465683a93142488a54a9038155f23d6349441 (patch) | |
tree | 95ccbeb4302d4b18fe0e12bfbb2b6b819ad84614 /net/tipc/core.h | |
parent | 7f9f95d9d9bcdf253c4149a157b096958013eceb (diff) |
tipc: make tipc broadcast link support net namespace
TIPC broadcast link is statically established and its relevant states
are maintained with the global variables: "bcbearer", "bclink" and
"bcl". Allowing different namespace to own different broadcast link
instances, these variables must be moved to tipc_net structure and
broadcast link instances would be allocated and initialized when
namespace is created.
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 | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 75a332b1968e..3f6f9e07da99 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h | |||
@@ -61,6 +61,11 @@ | |||
61 | 61 | ||
62 | #include "node.h" | 62 | #include "node.h" |
63 | #include "bearer.h" | 63 | #include "bearer.h" |
64 | #include "bcast.h" | ||
65 | #include "netlink.h" | ||
66 | #include "link.h" | ||
67 | #include "node.h" | ||
68 | #include "msg.h" | ||
64 | 69 | ||
65 | #define TIPC_MOD_VER "2.0.0" | 70 | #define TIPC_MOD_VER "2.0.0" |
66 | 71 | ||
@@ -91,6 +96,11 @@ struct tipc_net { | |||
91 | 96 | ||
92 | /* Bearer list */ | 97 | /* Bearer list */ |
93 | struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1]; | 98 | struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1]; |
99 | |||
100 | /* Broadcast link */ | ||
101 | struct tipc_bcbearer *bcbearer; | ||
102 | struct tipc_bclink *bclink; | ||
103 | struct tipc_link *bcl; | ||
94 | }; | 104 | }; |
95 | 105 | ||
96 | #ifdef CONFIG_SYSCTL | 106 | #ifdef CONFIG_SYSCTL |