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;