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/net.c | |
| parent | f2f9800d4955a96d92896841d8ba9b04201deaa1 (diff) | |
| download | linux-stable-7f9f95d9d9bcdf253c4149a157b096958013eceb.tar.gz linux-stable-7f9f95d9d9bcdf253c4149a157b096958013eceb.tar.bz2 linux-stable-7f9f95d9d9bcdf253c4149a157b096958013eceb.zip | |
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/net.c')
| -rw-r--r-- | net/tipc/net.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index de18aacf3d64..38633e5f8a7d 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -117,7 +117,7 @@ int tipc_net_start(struct net *net, u32 addr) tipc_own_addr = addr; tipc_named_reinit(); tipc_sk_reinit(); - res = tipc_bclink_init(); + res = tipc_bclink_init(net); if (res) return res; @@ -140,7 +140,7 @@ void tipc_net_stop(struct net *net) tipc_own_addr); rtnl_lock(); tipc_bearer_stop(net); - tipc_bclink_stop(); + tipc_bclink_stop(net); tipc_node_stop(net); rtnl_unlock(); |