aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/net.c
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2015-01-09 02:27:06 -0500
committerDavid S. Miller <davem@davemloft.net>2015-01-12 16:24:32 -0500
commit7f9f95d9d9bcdf253c4149a157b096958013eceb (patch)
tree779858049250f786a0b1b2d89482f3cdccd9617f /net/tipc/net.c
parentf2f9800d4955a96d92896841d8ba9b04201deaa1 (diff)
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.c4
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)
117 tipc_own_addr = addr; 117 tipc_own_addr = addr;
118 tipc_named_reinit(); 118 tipc_named_reinit();
119 tipc_sk_reinit(); 119 tipc_sk_reinit();
120 res = tipc_bclink_init(); 120 res = tipc_bclink_init(net);
121 if (res) 121 if (res)
122 return res; 122 return res;
123 123
@@ -140,7 +140,7 @@ void tipc_net_stop(struct net *net)
140 tipc_own_addr); 140 tipc_own_addr);
141 rtnl_lock(); 141 rtnl_lock();
142 tipc_bearer_stop(net); 142 tipc_bearer_stop(net);
143 tipc_bclink_stop(); 143 tipc_bclink_stop(net);
144 tipc_node_stop(net); 144 tipc_node_stop(net);
145 rtnl_unlock(); 145 rtnl_unlock();
146 146