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)
                 return -ENODEV;
 
         ret = class_create_file(netdev_class, &class_attr_bonding_masters);
+        /*
+         * Permit multiple loads of the module by ignoring failures to
+         * create the bonding_masters sysfs file.  Bonding devices
+         * created by second or subsequent loads of the module will
+         * not be listed in, or controllable by, bonding_masters, but
+         * will have the usual "bonding" sysfs directory.
+         *
+         * This is done to preserve backwards compatibility for
+         * initscripts/sysconfig, which load bonding multiple times to
+         * configure multiple bonding devices.
+         */
+        if (ret == -EEXIST) {
+                netdev_class = NULL;
+                return 0;
+        }
 
         return ret;