Commit 38d2f38b authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller

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: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0599ad53
...@@ -1437,8 +1437,16 @@ int bond_create_sysfs(void) ...@@ -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; /* Is someone being kinky and naming a device bonding_master? */
return 0; 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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment