From 0d35711c5e488883c8d5dec14fc9fdbfd5582c13 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Sun, 19 Oct 2008 23:33:56 -0700
Subject: [PATCH] --- yaml --- r: 116051 b: refs/heads/master c:
 92845ffd2a221f9f90b064ac55bb010bf27a193f h: refs/heads/master i:   116049:
 2b4442388b89c2349b6de869be11c6f970655ed1   116047:
 87e2a9883fd348f83006f8ab68458e858483be63 v: v3

---
 [refs]               | 2 +-
 trunk/net/core/dev.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a4fd60ec6fd9..c6b31ba2d227 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0537ae6a3d7d6d9005446ee6419272fd4c38a58d
+refs/heads/master: 92845ffd2a221f9f90b064ac55bb010bf27a193f
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index 868ec0ba8b77..b8a4fd0806af 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/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);