From 49166c640b17c02fdf95c9444dff7ae535e71732 Mon Sep 17 00:00:00 2001 From: Veaceslav Falico Date: Tue, 15 Nov 2011 06:44:42 +0000 Subject: [PATCH] --- yaml --- r: 275742 b: refs/heads/master c: 4a8bb7e27fbb68da888b55f26defd2855225b2d5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_sysfs.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a881179e0995..b17cab9f348f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 596a1b746c56f974240c8df6d8e3a026c54266ff +refs/heads/master: 4a8bb7e27fbb68da888b55f26defd2855225b2d5 diff --git a/trunk/drivers/net/bonding/bond_sysfs.c b/trunk/drivers/net/bonding/bond_sysfs.c index 5a20804fdece..4ef7e2fd9fe6 100644 --- a/trunk/drivers/net/bonding/bond_sysfs.c +++ b/trunk/drivers/net/bonding/bond_sysfs.c @@ -319,6 +319,13 @@ static ssize_t bonding_store_mode(struct device *d, goto out; } + if (bond->slave_cnt > 0) { + pr_err("unable to update mode of %s because it has slaves.\n", + bond->dev->name); + ret = -EPERM; + goto out; + } + new_value = bond_parse_parm(buf, bond_mode_tbl); if (new_value < 0) { pr_err("%s: Ignoring invalid mode value %.*s.\n",