diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-13 00:39:02 +0200 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-13 01:15:30 +0200 |
| commit | 9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68 (patch) | |
| tree | 780e0a4b694b7b7aaabe7d7a0df38275e025fad8 /net/dsa | |
| parent | Merge branch 'nfp-vf-rate-limit-support' (diff) | |
| parent | Merge tag 'net-5.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68.tar.xz linux-9b19e57a3c78f1f7c08a48bafb7d84caf6e80b68.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Build issue in drivers/net/ethernet/sfc/ptp.c
54fccfdd7c66 ("sfc: efx_default_channel_type APIs can be static")
49e6123c65da ("net: sfc: fix memory leak due to ptp channel")
https://lore.kernel.org/all/20220510130556.52598fe2@canb.auug.org.au/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/dsa')
| -rw-r--r-- | net/dsa/port.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c index 48e5a309ca5c..ecf0395cbddd 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -503,6 +503,7 @@ out_rollback_unoffload: switchdev_bridge_port_unoffload(brport_dev, dp, &dsa_slave_switchdev_notifier, &dsa_slave_switchdev_blocking_notifier); + dsa_flush_workqueue(); out_rollback_unbridge: dsa_broadcast(DSA_NOTIFIER_BRIDGE_LEAVE, &info); out_rollback: |