From ea5a3c9735c455a211d4b5d5655c2915144aaf2d Mon Sep 17 00:00:00 2001 From: Moni Shoua Date: Tue, 9 Oct 2007 19:43:40 -0700 Subject: [PATCH] --- yaml --- r: 69313 b: refs/heads/master c: 6b1bf096508c870889c2be63c7757a04d72116fe h: refs/heads/master i: 69311: d999e624a688fee87731dbe3cf14b08e79d0f5f4 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 5 +++-- trunk/drivers/net/bonding/bond_sysfs.c | 6 ++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 84bdb570b937..8f4bf551f104 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ab82852a2706b47c257ac87675ab8b06bc214dd +refs/heads/master: 6b1bf096508c870889c2be63c7757a04d72116fe diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 6508e0b2ea72..3eebfe287533 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/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/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c index 6f49ca7e9b66..ca4e429f9ec2 100644 --- a/trunk/drivers/net/bonding/bond_sysfs.c +++ b/trunk/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 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. */