diff options
| author | Ying Xue <ying.xue@windriver.com> | 2015-01-09 15:27:06 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-12 16:24:32 -0500 |
| commit | 7f9f95d9d9bcdf253c4149a157b096958013eceb (patch) | |
| tree | 779858049250f786a0b1b2d89482f3cdccd9617f /net/tipc/core.h | |
| parent | f2f9800d4955a96d92896841d8ba9b04201deaa1 (diff) | |
| download | op-kernel-dev-7f9f95d9d9bcdf253c4149a157b096958013eceb.zip op-kernel-dev-7f9f95d9d9bcdf253c4149a157b096958013eceb.tar.gz | |
tipc: make bearer list support net namespace
Bearer list defined as a global variable is used to store bearer
instances. When tipc supports net namespace, bearers created in
one namespace must be isolated with others allocated in other
namespaces, which requires us that the bearer list(bearer_list)
must be moved to tipc_net structure. As a result, a net namespace
pointer has to be passed to functions which access the bearer list.
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 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/tipc/core.h b/net/tipc/core.h index 4fb1133..75a332b 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h @@ -60,6 +60,7 @@ #include <net/netns/generic.h> #include "node.h" +#include "bearer.h" #define TIPC_MOD_VER "2.0.0" @@ -87,6 +88,9 @@ struct tipc_net { struct list_head node_list; u32 num_nodes; u32 num_links; + + /* Bearer list */ + struct tipc_bearer __rcu *bearer_list[MAX_BEARERS + 1]; }; #ifdef CONFIG_SYSCTL |
