Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=92845f...
Commit:     92845ffd2a221f9f90b064ac55bb010bf27a193f
Parent:     0537ae6a3d7d6d9005446ee6419272fd4c38a58d
Author:     Stephen Hemminger <shemminger@vyatta.com>
AuthorDate: Sun Oct 19 23:33:56 2008 -0700
Committer:  David S. Miller <davem@davemloft.net>
CommitDate: Sun Oct 19 23:33:56 2008 -0700

    netdev: change name dropping error codes
    
    If changename notifier returns an error code, it gets incorrectly
    cleared during rollback so the error is never returned to the user.
    Found while testing similar code for MTU changes.
    
    Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
---
 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 868ec0b..b8a4fd0 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)
 		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);
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html