From 2731373701848ec6100fe9038d776da1ff9bdc41 Mon Sep 17 00:00:00 2001
From: David Lamparter <equinox@diac24.net>
Date: Fri, 17 Sep 2010 03:22:19 +0000
Subject: [PATCH] --- yaml --- r: 214570 b: refs/heads/master c:
 3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/macvlan.c | 4 ++++
 trunk/net/8021q/vlan.c      | 4 ++++
 trunk/net/core/dev.c        | 4 ++++
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8ed7b2734760..6fa2a312c325 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b71c7aaa1e2a9858f0c469026098fbd6e046d7bb
+refs/heads/master: 3b27e105550f7c4a79ecb6d6a9c49c651c59ae9b
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index 0ef0eb0db945..0fc9dc7f20db 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/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;
diff --git a/trunk/net/8021q/vlan.c b/trunk/net/8021q/vlan.c
index a2ad15250575..2c6c2bd6e4a9 100644
--- a/trunk/net/8021q/vlan.c
+++ b/trunk/net/8021q/vlan.c
@@ -525,6 +525,10 @@ static int vlan_device_event(struct notifier_block *unused, unsigned long event,
 		break;
 
 	case NETDEV_UNREGISTER:
+		/* twiddle thumbs on netns device moves */
+		if (dev->reg_state != NETREG_UNREGISTERING)
+			break;
+
 		/* Delete all VLANs for this dev. */
 		grp->killall = 1;
 
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index c09ff096525a..2c7934f8cf3e 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -5686,6 +5686,10 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
 
 	/* Notify protocols, that we are about to destroy
 	   this device. They should clean all the things.
+
+	   Note that dev->reg_state stays at NETREG_REGISTERED.
+	   This is wanted because this way 8021q and macvlan know
+	   the device is just moving and can keep their slaves up.
 	*/
 	call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
 	call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);