diff options
| -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 868ec0ba8b77..b8a4fd0806af 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -924,10 +924,10 @@ int dev_change_name(struct net_device *dev, const char *newname) | |||
| 924 | strlcpy(dev->name, newname, IFNAMSIZ); | 924 | strlcpy(dev->name, newname, IFNAMSIZ); |
| 925 | 925 | ||
| 926 | rollback: | 926 | rollback: |
| 927 | err = device_rename(&dev->dev, dev->name); | 927 | ret = device_rename(&dev->dev, dev->name); |
| 928 | if (err) { | 928 | if (ret) { |
| 929 | memcpy(dev->name, oldname, IFNAMSIZ); | 929 | memcpy(dev->name, oldname, IFNAMSIZ); |
| 930 | return err; | 930 | return ret; |
| 931 | } | 931 | } |
| 932 | 932 | ||
| 933 | write_lock_bh(&dev_base_lock); | 933 | write_lock_bh(&dev_base_lock); |
