bonding: add all_slaves_active parameter

v2: changed parameter name from 'keep_all' to 'all_slaves_active' and
skipped setting slaves to inactive rather than creating a new flag at
Jay's suggestion.

In an effort to suppress duplicate frames on certain bonding modes
(specifically the modes that do not require additional configuration on
the switch or switches connected to the host), code was added in the
generic receive patch in 2.6.16.  The current behavior works quite well
for most users, but there are some times it would be nice to restore old
functionality and allow all frames to make their way up the stack.

This patch adds support for a new module option and sysfs file called
'all_slaves_active' that will restore pre-2.6.16 functionality if the
user desires.  The default value is '0' and retains existing behavior,
but the user can set it to '1' and allow all frames up if desired.

Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 52 insertions, 0 deletions

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 496ac1ec614d..066311a5e084 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1411,7 +1411,58 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 }
 static DEVICE_ATTR(ad_partner_mac, S_IRUGO, bonding_show_ad_partner_mac, NULL);
 
+/*
+ * Show and set the all_slaves_active flag.
+ */
+static ssize_t bonding_show_slaves_active(struct device *d,
+                                          struct device_attribute *attr,
+                                          char *buf)
+{
+        struct bonding *bond = to_bond(d);
+
+        return sprintf(buf, "%d\n", bond->params.all_slaves_active);
+}
+
+static ssize_t bonding_store_slaves_active(struct device *d,
+                                           struct device_attribute *attr,
+                                           const char *buf, size_t count)
+{
+        int i, new_value, ret = count;
+        struct bonding *bond = to_bond(d);
+        struct slave *slave;
+
+        if (sscanf(buf, "%d", &new_value) != 1) {
+                pr_err("%s: no all_slaves_active value specified.\n",
+                       bond->dev->name);
+                ret = -EINVAL;
+                goto out;
+        }
+
+        if (new_value == bond->params.all_slaves_active)
+                goto out;
+
+        if ((new_value == 0) || (new_value == 1)) {
+                bond->params.all_slaves_active = new_value;
+        } else {
+                pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
+                        bond->dev->name, new_value);
+                ret = -EINVAL;
+                goto out;
+        }
 
+        bond_for_each_slave(bond, slave, i) {
+                if (slave->state == BOND_STATE_BACKUP) {
+                        if (new_value)
+                                slave->dev->priv_flags &= ~IFF_SLAVE_INACTIVE;
+                        else
+                                slave->dev->priv_flags |= IFF_SLAVE_INACTIVE;
+                }
+        }
+out:
+        return count;
+}
+static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,
+                   bonding_show_slaves_active, bonding_store_slaves_active);
 
 static struct attribute *per_bond_attrs[] = {
         &dev_attr_slaves.attr,
@@ -1438,6 +1489,7 @@ static struct attribute *per_bond_attrs[] = {
         &dev_attr_ad_actor_key.attr,
         &dev_attr_ad_partner_key.attr,
         &dev_attr_ad_partner_mac.attr,
+        &dev_attr_all_slaves_active.attr,
         NULL,
 };