diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-06-23 12:33:24 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-06-23 12:33:24 -0700 |
| commit | 93817be8b62c7fa1f1bdc3e8c037a73a60026be9 (patch) | |
| tree | 873c207abc783edb4ead73b2b3a8a9b105f94420 /net/tipc | |
| parent | ccb9bc1dfa444e3541622ccfff135e83d2a569d1 (diff) | |
| parent | 399bd66e219e331976fe6fa6ab81a023c0c97870 (diff) | |
| download | linux-stable-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.gz linux-stable-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.tar.bz2 linux-stable-93817be8b62c7fa1f1bdc3e8c037a73a60026be9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tipc')
| -rw-r--r-- | net/tipc/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c index 3f4542e0f065..434e70eabe08 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c @@ -109,10 +109,9 @@ static void __net_exit tipc_exit_net(struct net *net) struct tipc_net *tn = tipc_net(net); tipc_detach_loopback(net); + tipc_net_stop(net); /* Make sure the tipc_net_finalize_work() finished */ cancel_work_sync(&tn->work); - tipc_net_stop(net); - tipc_bcast_stop(net); tipc_nametbl_stop(net); tipc_sk_rht_destroy(net); |