aboutsummaryrefslogtreecommitdiffstats
path: root/net/tipc/net.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/tipc/net.c')
-rw-r--r--net/tipc/net.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c
index 5ce9d628f2d0..de18aacf3d64 100644
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -121,7 +121,7 @@ int tipc_net_start(struct net *net, u32 addr)
121 if (res) 121 if (res)
122 return res; 122 return res;
123 123
124 tipc_nametbl_publish(TIPC_CFG_SRV, tipc_own_addr, tipc_own_addr, 124 tipc_nametbl_publish(net, TIPC_CFG_SRV, tipc_own_addr, tipc_own_addr,
125 TIPC_ZONE_SCOPE, 0, tipc_own_addr); 125 TIPC_ZONE_SCOPE, 0, tipc_own_addr);
126 126
127 pr_info("Started in network mode\n"); 127 pr_info("Started in network mode\n");
@@ -131,16 +131,17 @@ int tipc_net_start(struct net *net, u32 addr)
131 return 0; 131 return 0;
132} 132}
133 133
134void tipc_net_stop(void) 134void tipc_net_stop(struct net *net)
135{ 135{
136 if (!tipc_own_addr) 136 if (!tipc_own_addr)
137 return; 137 return;
138 138
139 tipc_nametbl_withdraw(TIPC_CFG_SRV, tipc_own_addr, 0, tipc_own_addr); 139 tipc_nametbl_withdraw(net, TIPC_CFG_SRV, tipc_own_addr, 0,
140 tipc_own_addr);
140 rtnl_lock(); 141 rtnl_lock();
141 tipc_bearer_stop(); 142 tipc_bearer_stop(net);
142 tipc_bclink_stop(); 143 tipc_bclink_stop();
143 tipc_node_stop(); 144 tipc_node_stop(net);
144 rtnl_unlock(); 145 rtnl_unlock();
145 146
146 pr_info("Left network mode\n"); 147 pr_info("Left network mode\n");