diff options
| author | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
| commit | b20b378d49926b82c0a131492fa8842156e0e8a9 (patch) | |
| tree | 7196847eea049a46442b05f99aee1dc571019381 /net/l2tp | |
| parent | 02154927c115c7599677df57203988e05b576346 (diff) | |
| parent | da499f8f5385c181e29978fdaab15a58de185302 (diff) | |
| download | linux-next-b20b378d49926b82c0a131492fa8842156e0e8a9.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig
All conflicts were cases of overlapping commits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp')
| -rw-r--r-- | net/l2tp/l2tp_core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 1e40dacaa137..a2ed3bda4ddc 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1855,6 +1855,9 @@ static __net_exit void l2tp_exit_net(struct net *net) (void)l2tp_tunnel_delete(tunnel); } rcu_read_unlock_bh(); + + flush_workqueue(l2tp_wq); + rcu_barrier(); } static struct pernet_operations l2tp_net_ops = { |