Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 116051
b: refs/heads/master
c: 92845ff
h: refs/heads/master
i:
  116049: 2b44423
  116047: 87e2a98
v: v3
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed Oct 20, 2008
1 parent 1008033 commit 0d35711
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0537ae6a3d7d6d9005446ee6419272fd4c38a58d
refs/heads/master: 92845ffd2a221f9f90b064ac55bb010bf27a193f
6 changes: 3 additions & 3 deletions trunk/net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,10 +924,10 @@ int dev_change_name(struct net_device *dev, const char *newname)
strlcpy(dev->name, newname, IFNAMSIZ);

rollback:
err = device_rename(&dev->dev, dev->name);
if (err) {
ret = device_rename(&dev->dev, dev->name);
if (ret) {
memcpy(dev->name, oldname, IFNAMSIZ);
return err;
return ret;
}

write_lock_bh(&dev_base_lock);
Expand Down

0 comments on commit 0d35711

Please sign in to comment.