xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Browse Source 
Minor conflict with the DSA legacy code removal.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2019-05-07 17:22:09 -07:00
parent 23bfaa5940 a3147770be
commit a9e41a5296
23 changed files with 293 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/l2tp/l2tp_core.c
View File

@@ -1735,7 +1735,8 @@ static __net_exit void l2tp_exit_net(struct net *net)
}
rcu_read_unlock_bh();
flush_workqueue(l2tp_wq);
if (l2tp_wq)
flush_workqueue(l2tp_wq);
rcu_barrier();
for (hash = 0; hash < L2TP_HASH_SIZE_2; hash++)