From ce39c97d5e90071ac63cfa4a102d306b765177b6 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Fri, 26 Oct 2007 03:53:42 -0700
Subject: [PATCH] --- yaml --- r: 72615 b: refs/heads/master c:
 c8d90dca3211966ba5189e0f3d4bccd558d9ae08 h: refs/heads/master i:   72613:
 18d985055e8ba7b5ac288775bb1975e2ffda99b0   72611:
 e5c9e9deaf2d49451ea593bfa9f800bb2a81e70e   72607:
 79597375935523268e7dc2d04a161de9bdaf9887 v: v3

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

diff --git a/[refs] b/[refs]
index 9ea663e23875..f97ac5d95ecb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c56a347c1dfbe384b1ffb65d8828faa36dbaea4
+refs/heads/master: c8d90dca3211966ba5189e0f3d4bccd558d9ae08
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index f1647d7dd14b..ddfef3b45bab 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -883,6 +883,9 @@ int dev_change_name(struct net_device *dev, char *newname)
 	if (!dev_valid_name(newname))
 		return -EINVAL;
 
+	if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
+		return 0;
+
 	memcpy(oldname, dev->name, IFNAMSIZ);
 
 	if (strchr(newname, '%')) {