diff options
author | Stephen Hemminger <shemminger@vyatta.com> | 2009-06-11 08:46:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-11 08:46:04 -0400 |
commit | 130aa61a77b8518f1ea618e1b7d214d60b405f10 (patch) | |
tree | 56231709cf0a5f1108fbdd0909a0b346a31a9b86 /drivers/net/bonding | |
parent | 5ef12d98a19254ee5dc851bd83e214b43ec1f725 (diff) |
bonding: fix multiple module load problem
Some users still load bond module multiple times to create bonding
devices. This accidentally was broken by a later patch about
the time sysfs was fixed. According to Jay, it was broken
by:
commit b8a9787eddb0e4665f31dd1d64584732b2b5d051
Author: Jay Vosburgh <fubar@us.ibm.com>
Date: Fri Jun 13 18:12:04 2008 -0700
bonding: Allow setting max_bonds to zero
Note: sysfs and procfs still produce WARN() messages when this is done
so the sysfs method is the recommended API.
Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 3a1b7b04eb79..5fb861a08664 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -1541,6 +1541,7 @@ int bond_create_sysfs(void) | |||
1541 | printk(KERN_ERR | 1541 | printk(KERN_ERR |
1542 | "network device named %s already exists in sysfs", | 1542 | "network device named %s already exists in sysfs", |
1543 | class_attr_bonding_masters.attr.name); | 1543 | class_attr_bonding_masters.attr.name); |
1544 | ret = 0; | ||
1544 | } | 1545 | } |
1545 | 1546 | ||
1546 | return ret; | 1547 | return ret; |