diff options
author | 2019-04-08 13:03:09 +0200 | |
---|---|---|
committer | 2019-04-08 13:03:09 +0200 | |
commit | 26af34079f1d8299932303cfd2b376b9cf55a35c (patch) | |
tree | f1a9824855fae569aa51c2109a5929715143093d /net/tipc/net.c | |
parent | gpio: mmio: Drop bgpio_dir_inverted (diff) | |
parent | Linux 5.1-rc3 (diff) | |
download | wireguard-linux-26af34079f1d8299932303cfd2b376b9cf55a35c.tar.xz wireguard-linux-26af34079f1d8299932303cfd2b376b9cf55a35c.zip |
Merge tag 'v5.1-rc3' into devel
Linux 5.1-rc3
Diffstat (limited to '')
-rw-r--r-- | net/tipc/net.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/tipc/net.c b/net/tipc/net.c index f076edb74338..7ce1e86b024f 100644 --- a/net/tipc/net.c +++ b/net/tipc/net.c @@ -163,12 +163,9 @@ void tipc_sched_net_finalize(struct net *net, u32 addr) void tipc_net_stop(struct net *net) { - u32 self = tipc_own_addr(net); - - if (!self) + if (!tipc_own_id(net)) return; - tipc_nametbl_withdraw(net, TIPC_CFG_SRV, self, self, self); rtnl_lock(); tipc_bearer_stop(net); tipc_node_stop(net); |