aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_main.c5
-rw-r--r--drivers/net/bonding/bond_sysfs.c6
2 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index 6508e0b2ea72..3eebfe287533 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)
1280 1280
1281 /* bond must be initialized by bond_open() before enslaving */ 1281 /* bond must be initialized by bond_open() before enslaving */
1282 if (!(bond_dev->flags & IFF_UP)) { 1282 if (!(bond_dev->flags & IFF_UP)) {
1283 dprintk("Error, master_dev is not up\n"); 1283 printk(KERN_WARNING DRV_NAME
1284 return -EPERM; 1284 " %s: master_dev is not up in bond_enslave\n",
1285 bond_dev->name);
1285 } 1286 }
1286 1287
1287 /* already enslaved */ 1288 /* already enslaved */
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 6f49ca7e9b66..ca4e429f9ec2 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,
266 266
267 /* Quick sanity check -- is the bond interface up? */ 267 /* Quick sanity check -- is the bond interface up? */
268 if (!(bond->dev->flags & IFF_UP)) { 268 if (!(bond->dev->flags & IFF_UP)) {
269 printk(KERN_ERR DRV_NAME 269 printk(KERN_WARNING DRV_NAME
270 ": %s: Unable to update slaves because interface is down.\n", 270 ": %s: doing slave updates when interface is down.\n",
271 bond->dev->name); 271 bond->dev->name);
272 ret = -EPERM;
273 goto out;
274 } 272 }
275 273
276 /* Note: We can't hold bond->lock here, as bond_create grabs it. */ 274 /* Note: We can't hold bond->lock here, as bond_create grabs it. */