From bf1d083c4f60507e3928afdef8448b814c054e9a Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Mon, 13 Sep 2010 12:24:54 +0000
Subject: [PATCH] --- yaml --- r: 210807 b: refs/heads/master c:
 ef885afbf8a37689afc1d9d545e2f3e7a8276c17 h: refs/heads/master i:   210805:
 b14028222bbaffbc17a1345c2f8d23b0ddb1a012   210803:
 35b5dac854b096e2bce7347ac58d235a72438423   210799:
 7e1d9f248bf45295e586ef995ab339f4cfcf9bf3 v: v3

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

diff --git a/[refs] b/[refs]
index a361d84b99dc..d691eadb7dd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab12811c89e88f2e66746790b1fe4469ccb7bdd9
+refs/heads/master: ef885afbf8a37689afc1d9d545e2f3e7a8276c17
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index b9b22a3c4c8f..660dd41aaaa6 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -4845,7 +4845,7 @@ static void rollback_registered_many(struct list_head *head)
 	dev = list_first_entry(head, struct net_device, unreg_list);
 	call_netdevice_notifiers(NETDEV_UNREGISTER_BATCH, dev);
 
-	synchronize_net();
+	rcu_barrier();
 
 	list_for_each_entry(dev, head, unreg_list)
 		dev_put(dev);