From 09ca87986769946692c31ac20beee2625fc7d5d5 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Thu, 19 May 2011 12:24:16 +0000
Subject: [PATCH] --- yaml --- r: 247745 b: refs/heads/master c:
 449f4544267e73d5db372971da63634707c32299 h: refs/heads/master i:   247743:
 32477df54683078a13b636d03ac4a839ee96a0ab v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/net/macvlan.c     | 9 +++++----
 trunk/include/linux/netdevice.h | 4 +++-
 trunk/net/core/dev.c            | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index b15171f486c2..9d71b518b9bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 034cfe48d0efc248ba4b725e3a94b95e76fbc5d3
+refs/heads/master: 449f4544267e73d5db372971da63634707c32299
diff --git a/trunk/drivers/net/macvlan.c b/trunk/drivers/net/macvlan.c
index d7c0bc62da7f..07bcb8084d78 100644
--- a/trunk/drivers/net/macvlan.c
+++ b/trunk/drivers/net/macvlan.c
@@ -70,16 +70,17 @@ static void macvlan_hash_add(struct macvlan_dev *vlan)
 	hlist_add_head_rcu(&vlan->hlist, &port->vlan_hash[addr[5]]);
 }
 
-static void macvlan_hash_del(struct macvlan_dev *vlan)
+static void macvlan_hash_del(struct macvlan_dev *vlan, bool sync)
 {
 	hlist_del_rcu(&vlan->hlist);
-	synchronize_rcu();
+	if (sync)
+		synchronize_rcu();
 }
 
 static void macvlan_hash_change_addr(struct macvlan_dev *vlan,
 					const unsigned char *addr)
 {
-	macvlan_hash_del(vlan);
+	macvlan_hash_del(vlan, true);
 	/* Now that we are unhashed it is safe to change the device
 	 * address without confusing packet delivery.
 	 */
@@ -345,7 +346,7 @@ static int macvlan_stop(struct net_device *dev)
 	dev_uc_del(lowerdev, dev->dev_addr);
 
 hash_del:
-	macvlan_hash_del(vlan);
+	macvlan_hash_del(vlan, !dev->dismantle);
 	return 0;
 }
 
diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h
index a134d809125b..ca333e79e10f 100644
--- a/trunk/include/linux/netdevice.h
+++ b/trunk/include/linux/netdevice.h
@@ -1293,7 +1293,9 @@ struct net_device {
 	       NETREG_UNREGISTERED,	/* completed unregister todo */
 	       NETREG_RELEASED,		/* called free_netdev */
 	       NETREG_DUMMY,		/* dummy device for NAPI poll */
-	} reg_state:16;
+	} reg_state:8;
+
+	bool dismantle; /* device is going do be freed */
 
 	enum {
 		RTNL_LINK_INITIALIZED,
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 155de2094e71..d94537914a71 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -5126,7 +5126,7 @@ static void rollback_registered_many(struct list_head *head)
 			list_del(&dev->unreg_list);
 			continue;
 		}
-
+		dev->dismantle = true;
 		BUG_ON(dev->reg_state != NETREG_REGISTERED);
 	}