summaryrefslogtreecommitdiffstats
path: root/drivers/net/macvlan.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-12-13 14:28:47 +0100
committerJiri Kosina <jkosina@suse.cz>2022-12-13 14:28:47 +0100
commitab970ae1d63822228bdc84b9c1514efbd2f66da7 (patch)
treefefc08d8dd28e4eb5465ca85de5cce2fb6f1b7ef /drivers/net/macvlan.c
parentcfd1f6c16f7deadfe5269a76c1516405c4466481 (diff)
parent163a7fbff7a78c7c055e6c0ad26124ae551fe313 (diff)
downloadlinux-ab970ae1d63822228bdc84b9c1514efbd2f66da7.tar.bz2
Merge branch 'for-6.2/default-remove-cleanup' into for-linus
- removal of superfluous hid_hw_stop() calls for drivers with default .remove callback (Marcus Folkesson)
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r--drivers/net/macvlan.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index c5cfe8555199..578897aaada0 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1533,8 +1533,10 @@ destroy_macvlan_port:
/* the macvlan port may be freed by macvlan_uninit when fail to register.
* so we destroy the macvlan port only when it's valid.
*/
- if (create && macvlan_port_get_rtnl(lowerdev))
+ if (create && macvlan_port_get_rtnl(lowerdev)) {
+ macvlan_flush_sources(port, vlan);
macvlan_port_destroy(port->dev);
+ }
return err;
}
EXPORT_SYMBOL_GPL(macvlan_common_newlink);