diff options
Diffstat (limited to 'net/core/dev.c')
-rw-r--r-- | net/core/dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index e660cb57e42a..455d589683e8 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -751,7 +751,7 @@ int dev_change_name(struct net_device *dev, char *newname) | |||
751 | else | 751 | else |
752 | strlcpy(dev->name, newname, IFNAMSIZ); | 752 | strlcpy(dev->name, newname, IFNAMSIZ); |
753 | 753 | ||
754 | err = class_device_rename(&dev->class_dev, dev->name); | 754 | err = device_rename(&dev->dev, dev->name); |
755 | if (!err) { | 755 | if (!err) { |
756 | hlist_del(&dev->name_hlist); | 756 | hlist_del(&dev->name_hlist); |
757 | hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); | 757 | hlist_add_head(&dev->name_hlist, dev_name_hash(dev->name)); |
@@ -3221,8 +3221,8 @@ void free_netdev(struct net_device *dev) | |||
3221 | BUG_ON(dev->reg_state != NETREG_UNREGISTERED); | 3221 | BUG_ON(dev->reg_state != NETREG_UNREGISTERED); |
3222 | dev->reg_state = NETREG_RELEASED; | 3222 | dev->reg_state = NETREG_RELEASED; |
3223 | 3223 | ||
3224 | /* will free via class release */ | 3224 | /* will free via device release */ |
3225 | class_device_put(&dev->class_dev); | 3225 | put_device(&dev->dev); |
3226 | #else | 3226 | #else |
3227 | kfree((char *)dev - dev->padded); | 3227 | kfree((char *)dev - dev->padded); |
3228 | #endif | 3228 | #endif |