From 106299b7000293fd1217580adaba6604b4a57e2f Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Mon, 30 Jul 2007 16:35:46 -0700
Subject: [PATCH] --- yaml --- r: 63403 b: refs/heads/master c:
 7f988eab57bd22884bbc452fb04c6c18738666b3 h: refs/heads/master i:   63401:
 b8fccbdbe269b73c0e6b75b3a4e588d4c33e0a23   63399:
 d5719ff4f45af1dd87d6ab0e875504522118cc62 v: v3

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

diff --git a/[refs] b/[refs]
index 56d8a7ab10b7..7ee6c46787bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ce1b0edcb11f90f6fc5e0ceecff467f329889a0
+refs/heads/master: 7f988eab57bd22884bbc452fb04c6c18738666b3
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 7bfea5e9030e..346cbf66534e 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -839,8 +839,12 @@ int dev_change_name(struct net_device *dev, char *newname)
 		strlcpy(dev->name, newname, IFNAMSIZ);
 
 	device_rename(&dev->dev, dev->name);
+
+	write_lock_bh(&dev_base_lock);
 	hlist_del(&dev->name_hlist);
 	hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name));
+	write_unlock_bh(&dev_base_lock);
+
 	raw_notifier_call_chain(&netdev_chain, NETDEV_CHANGENAME, dev);
 
 	return err;