diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-18 20:27:47 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-18 20:27:47 (GMT) |
| commit | 1c0dc06e47e11bf758f3e84ea90c2178a31dbf0f (patch) | |
| tree | 292f4bf6b8839a40d80a1a8df989e435f0891d84 | |
| parent | 8b60f5ea90c49344692a70f62cd4aa349de38b48 (diff) | |
| download | linux-fsl-qoriq-1c0dc06e47e11bf758f3e84ea90c2178a31dbf0f.tar.xz | |
Revert "net: rename sysfs symlinks on device name change"
This reverts commit 45ce45c69750b93b8262aa66792185bd49150293.
| -rw-r--r-- | include/linux/netdevice.h | 1 | ||||
| -rw-r--r-- | net/core/dev.c | 22 |
2 files changed, 0 insertions, 23 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index cfde9a5..8fa1219 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2886,7 +2886,6 @@ void netdev_upper_dev_unlink(struct net_device *dev, struct net_device *upper_dev); void *netdev_lower_dev_get_private_rcu(struct net_device *dev, struct net_device *lower_dev); -void netdev_adjacent_rename_links(struct net_device *dev, char *oldname); void *netdev_lower_dev_get_private(struct net_device *dev, struct net_device *lower_dev); int skb_checksum_help(struct sk_buff *skb); diff --git a/net/core/dev.c b/net/core/dev.c index df70378..d518938 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -1118,8 +1118,6 @@ rollback: write_seqcount_end(&devnet_rename_seq); - netdev_adjacent_rename_links(dev, oldname); - write_lock_bh(&dev_base_lock); hlist_del_rcu(&dev->name_hlist); write_unlock_bh(&dev_base_lock); @@ -1139,7 +1137,6 @@ rollback: err = ret; write_seqcount_begin(&devnet_rename_seq); memcpy(dev->name, oldname, IFNAMSIZ); - memcpy(oldname, newname, IFNAMSIZ); goto rollback; } else { pr_err("%s: name change rollback failed: %d\n", @@ -5002,25 +4999,6 @@ void *netdev_lower_dev_get_private_rcu(struct net_device *dev, } EXPORT_SYMBOL(netdev_lower_dev_get_private_rcu); -void netdev_adjacent_rename_links(struct net_device *dev, char *oldname) -{ - struct netdev_adjacent *iter; - - list_for_each_entry(iter, &dev->adj_list.upper, list) { - netdev_adjacent_sysfs_del(iter->dev, oldname, - &iter->dev->adj_list.lower); - netdev_adjacent_sysfs_add(iter->dev, dev, - &iter->dev->adj_list.lower); - } - - list_for_each_entry(iter, &dev->adj_list.lower, list) { - netdev_adjacent_sysfs_del(iter->dev, oldname, - &iter->dev->adj_list.upper); - netdev_adjacent_sysfs_add(iter->dev, dev, - &iter->dev->adj_list.upper); - } -} - void *netdev_lower_dev_get_private(struct net_device *dev, struct net_device *lower_dev) { |