[openib-general] [RFC] [PATCH V2 3/3] enable IP multicast for bonding IPoIB devices - allow not UP enslavement

[Or Gerlitz]

Signed-off-by: Or Gerlitz <ogerlitz at voltaire.com>

Index: net-2.6.20/drivers/net/bonding/bond_sysfs.c
===================================================================
--- net-2.6.20.orig/drivers/net/bonding/bond_sysfs.c	2006-11-30 10:45:53.000000000 +0200
+++ net-2.6.20/drivers/net/bonding/bond_sysfs.c	2006-11-30 10:48:13.000000000 +0200
@@ -265,11 +265,9 @@ static ssize_t bonding_store_slaves(stru

 	/* Quick sanity check -- is the bond interface up? */
 	if (!(bond->dev->flags & IFF_UP)) {
-		printk(KERN_ERR DRV_NAME
-		       ": %s: Unable to update slaves because interface is down.\n",
+		printk(KERN_WARNING DRV_NAME
+		       ": %s: doing slave updates when interface is down.\n",
 		       bond->dev->name);
-		ret = -EPERM;
-		goto out;
 	}

 	/* Note:  We can't hold bond->lock here, as bond_create grabs it. */
Index: net-2.6.20/drivers/net/bonding/bond_main.c
===================================================================
--- net-2.6.20.orig/drivers/net/bonding/bond_main.c	2006-11-30 10:46:57.000000000 +0200
+++ net-2.6.20/drivers/net/bonding/bond_main.c	2006-11-30 10:48:13.000000000 +0200
@@ -1298,8 +1298,8 @@ int bond_enslave(struct net_device *bond

 	/* bond must be initialized by bond_open() before enslaving */
 	if (!(bond_dev->flags & IFF_UP)) {
-		dprintk("Error, master_dev is not up\n");
-		return -EPERM;
+		printk(KERN_WARNING DRV_NAME
+			" %s: master_dev is not up in bond_enslave\n", bond_dev->name);
 	}

 	/* already enslaved */