Browse Source

bonding: handle case of device named bonding_master

If device already exists named bonding_masters, then fail. This is a wierd
corner case only a QA group could love.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stephen Hemminger 17 years ago
parent
commit
38d2f38be9
1 changed files with 10 additions and 2 deletions
  1. 10 2
      drivers/net/bonding/bond_sysfs.c

+ 10 - 2
drivers/net/bonding/bond_sysfs.c

@@ -1437,8 +1437,16 @@ int bond_create_sysfs(void)
 	 * configure multiple bonding devices.
 	 * configure multiple bonding devices.
 	 */
 	 */
 	if (ret == -EEXIST) {
 	if (ret == -EEXIST) {
-		netdev_class = NULL;
-		return 0;
+		/* Is someone being kinky and naming a device bonding_master? */
+		if (__dev_get_by_name(&init_net,
+				      class_attr_bonding_masters.attr.name))
+			printk(KERN_ERR
+			       "network device named %s already exists in sysfs",
+			       class_attr_bonding_masters.attr.name);
+		else {
+			netdev_class = NULL;
+			return 0;
+		}
 	}
 	}
 
 
 	return ret;
 	return ret;