X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmacvlan.c;h=0fc9dc7f20db02da7ac784c193b940453b7eccd7;hb=3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b;hp=0ef0eb0db94564dda7d0c7f28c7581db799e0e7a;hpb=26b55633a891a28bf04f42882de145eb8e9cb9ad;p=deliverable%2Flinux.git

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,
 		}
 		break;
 	case NETDEV_UNREGISTER:
+		/* twiddle thumbs on netns device moves */
+		if (dev->reg_state != NETREG_UNREGISTERING)
+			break;
+
 		list_for_each_entry_safe(vlan, next, &port->vlans, list)
 			vlan->dev->rtnl_link_ops->dellink(vlan->dev, NULL);
 		break;