Commit:     6b1bf096508c870889c2be63c7757a04d72116fe
Parent:     2ab82852a2706b47c257ac87675ab8b06bc214dd
Author:     Moni Shoua <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 9 19:43:40 2007 -0700
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Mon Oct 15 14:20:46 2007 -0400

    net/bonding: Enable IP multicast for bonding IPoIB devices
    Allow to enslave devices when the bonding device is not up. Over the 
    held at the previous post this seemed to be the most clean way to go, where 
    is not expected to cause instabilities.
    Normally, the bonding driver is UP before any enslavement takes place.
    Once a netdevice is UP, the network stack acts to have it join some 
multicast groups
    (eg the all-hosts Now, since ether_setup() have set the bonding 
    type to be ARPHRD_ETHER and address len to be ETHER_ALEN, the net core code
    computes a wrong multicast link address. This is b/c ip_eth_mc_map() is 
    where for multicast joins taking place after the enslavement another 
    is called (eg ip_ib_mc_map() when the bond type is ARPHRD_INFINIBAND)
    Signed-off-by: Moni Shoua <monis at>
    Signed-off-by: Or Gerlitz <ogerlitz at>
    Acked-by: Jay Vosburgh <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/bonding/bond_main.c  |    5 +++--
 drivers/net/bonding/bond_sysfs.c |    6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6508e0b..3eebfe2 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1280,8 +1280,9 @@ int bond_enslave(struct net_device *bond_dev, struct 
net_device *slave_dev)
        /* 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 */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 6f49ca7..ca4e429 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -266,11 +266,9 @@ static ssize_t bonding_store_slaves(struct device *d,
        /* 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 
+               printk(KERN_WARNING DRV_NAME
+                      ": %s: doing slave updates when interface is down.\n",
-               ret = -EPERM;
-               goto out;
        /* Note:  We can't hold bond->lock here, as bond_create grabs it. */
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to