diff options
Diffstat (limited to 'drivers/net/macvlan.c')
-rw-r--r-- | drivers/net/macvlan.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 0ef0eb0db945..0fc9dc7f20db 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c | |||
@@ -788,6 +788,10 @@ static int macvlan_device_event(struct notifier_block *unused, | |||
788 | } | 788 | } |
789 | break; | 789 | break; |
790 | case NETDEV_UNREGISTER: | 790 | case NETDEV_UNREGISTER: |
791 | /* twiddle thumbs on netns device moves */ | ||
792 | if (dev->reg_state != NETREG_UNREGISTERING) | ||
793 | break; | ||
794 | |||
791 | list_for_each_entry_safe(vlan, next, &port->vlans, list) | 795 | list_for_each_entry_safe(vlan, next, &port->vlans, list) |
792 | vlan->dev->rtnl_link_ops->dellink(vlan->dev, NULL); | 796 | vlan->dev->rtnl_link_ops->dellink(vlan->dev, NULL); |
793 | break; | 797 | break; |