[NET]: Network device renaming sysfs fix.

b73fdeae · Stephen Hemminger · 6d62388c · b73fdeae
Commit b73fdeae authored Aug 15, 2003 by Stephen Hemminger
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 6 deletions

net/core/dev.c net/core/dev.c +10 -6

No files found.
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2343,14 +2343,18 @@ static int dev_ifsioc(struct ifreq *ifr, unsigned int cmd)
 		case SIOCSIFNAME:
 			if (dev->flags & IFF_UP)
 				return -EBUSY;
+			ifr->ifr_newname[IFNAMSIZ-1] = '\0';
 			if (__dev_get_by_name(ifr->ifr_newname))
 				return -EEXIST;
-			memcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
+			err = class_device_rename(&dev->class_dev, 
-			dev->name[IFNAMSIZ - 1] = 0;
+						  ifr->ifr_newname);
-			strlcpy(dev->class_dev.class_id, dev->name, BUS_ID_SIZE);
+			if (!err) {
-			notifier_call_chain(&netdev_chain,
+				strlcpy(dev->name, ifr->ifr_newname, IFNAMSIZ);
-					    NETDEV_CHANGENAME, dev);
-			return 0;
+				notifier_call_chain(&netdev_chain,
+						    NETDEV_CHANGENAME, dev);
+			}
+			return err;
 		/*
 		 *	Unknown or private ioctl