---

yaml --- r: 63403 b: refs/heads/master c: 7f988ea h: refs/heads/master i: 63401: b8fccbd 63399: d5719ff v: v3
git-mirror · Jul 31, 2007 · 106299b · 106299b
1 parent 189ced6
commit 106299b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;