From 2a627c487318d1ee7d5d6d5c9833f04076870b83 Mon Sep 17 00:00:00 2001
From: Gao feng <gaofeng@cn.fujitsu.com>
Date: Thu, 23 Aug 2012 15:36:55 +0000
Subject: [PATCH] --- yaml --- r: 327712 b: refs/heads/master c:
 6549dd43c04327071571edf7aea4465b16539422 h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff6cf3289f82..ed2d8b2a5f6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6acb384807406c1a6ad3ddc91191f7658e63b7a
+refs/heads/master: 6549dd43c04327071571edf7aea4465b16539422
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 3401e2dab7cc..a5fc3e301cf2 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -6259,6 +6259,8 @@ int dev_change_net_namespace(struct net_device *dev, struct net *net, const char
 	   the device is just moving and can keep their slaves up.
 	*/
 	call_netdevice_notifiers(NETDEV_UNREGISTER, dev);
+	rcu_barrier();
+	call_netdevice_notifiers(NETDEV_UNREGISTER_FINAL, dev);
 	rtmsg_ifinfo(RTM_DELLINK, dev, ~0U);
 
 	/*