diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:21:56 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-07 22:21:56 -0500 |
commit | 7677ced48e2bbbb8d847d34f37e5d96d2b0e41e4 (patch) | |
tree | 0a859f403c02eb854d9ffa11bd17f77056891d07 /drivers/net/bonding/bond_sysfs.c | |
parent | 21d37bbc65e39a26856de6b14be371ff24e0d03f (diff) | |
parent | ac38dfc39e7684f55174742e5f0d6c5a0093bbf6 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (116 commits)
sk98lin: planned removal
AT91: MACB support
sky2: version 1.12
sky2: add new chip ids
sky2: Yukon Extreme support
sky2: safer transmit timeout
sky2: TSO support for EC_U
sky2: use dev_err for error reports
sky2: add Wake On Lan support
fix unaligned exception in /drivers/net/wireless/orinoco.c
Remove unused kernel config option DLCI_COUNT
z85230: spinlock logic
mips: declance: Driver model for the PMAD-A
Spidernet: Rework RX linked list
NET: turn local_save_flags() + local_irq_disable() into local_irq_save()
NET-3c59x: turn local_save_flags() + local_irq_disable() into local_irq_save()
hp100: convert pci_module_init() to pci_register_driver()
NetXen: Added ethtool support for user level tools.
NetXen: Firmware crb init changes.
maintainers: add atl1 maintainers
...
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index ced9ed8f995a..8e317e115532 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c | |||
@@ -1372,6 +1372,21 @@ int bond_create_sysfs(void) | |||
1372 | return -ENODEV; | 1372 | return -ENODEV; |
1373 | 1373 | ||
1374 | ret = class_create_file(netdev_class, &class_attr_bonding_masters); | 1374 | ret = class_create_file(netdev_class, &class_attr_bonding_masters); |
1375 | /* | ||
1376 | * Permit multiple loads of the module by ignoring failures to | ||
1377 | * create the bonding_masters sysfs file. Bonding devices | ||
1378 | * created by second or subsequent loads of the module will | ||
1379 | * not be listed in, or controllable by, bonding_masters, but | ||
1380 | * will have the usual "bonding" sysfs directory. | ||
1381 | * | ||
1382 | * This is done to preserve backwards compatibility for | ||
1383 | * initscripts/sysconfig, which load bonding multiple times to | ||
1384 | * configure multiple bonding devices. | ||
1385 | */ | ||
1386 | if (ret == -EEXIST) { | ||
1387 | netdev_class = NULL; | ||
1388 | return 0; | ||
1389 | } | ||
1375 | 1390 | ||
1376 | return ret; | 1391 | return ret; |
1377 | 1392 | ||