bonding: convert all_slaves_active to use the new option API

This patch adds the necessary changes so all_slaves_active would use
the new bonding option API.

Signed-off-by: Nikolay Aleksandrov <nikolay@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
index dba1f2e223718a3c151b7ca5633c6f5caaa6f935..828013a16c5243f4c2b0704a4691e5c593c530e5 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -282,8 +282,8 @@ static int bond_changelink(struct net_device *bond_dev,
                int all_slaves_active =
                        nla_get_u8(data[IFLA_BOND_ALL_SLAVES_ACTIVE]);
 
-               err = bond_option_all_slaves_active_set(bond,
-                                                       all_slaves_active);
+               bond_opt_initval(&newval, all_slaves_active);
+               err = __bond_opt_set(bond, BOND_OPT_ALL_SLAVES_ACTIVE, &newval);
                if (err)
                        return err;
        }

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 8775c724c700127f8395f4e0be374f10f437d1f9..7fafc34ca47b6fa184e4b0c587747c6f37350c7c 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -105,6 +105,12 @@ static struct bond_opt_value bond_use_carrier_tbl[] = {
        { NULL,  -1, 0}
 };
 
+static struct bond_opt_value bond_all_slaves_active_tbl[] = {
+       { "off", 0,  BOND_VALFLAG_DEFAULT},
+       { "on",  1,  0},
+       { NULL,  -1, 0}
+};
+
 static struct bond_option bond_opts[] = {
        [BOND_OPT_MODE] = {
                .id = BOND_OPT_MODE,
@@ -261,6 +267,13 @@ static struct bond_option bond_opts[] = {
                .flags = BOND_OPTFLAG_RAWVAL,
                .set = bond_option_queue_id_set
        },
+       [BOND_OPT_ALL_SLAVES_ACTIVE] = {
+               .id = BOND_OPT_ALL_SLAVES_ACTIVE,
+               .name = "all_slaves_active",
+               .desc = "Keep all frames received on an interface by setting active flag for all slaves",
+               .values = bond_all_slaves_active_tbl,
+               .set = bond_option_all_slaves_active_set
+       },
        { }
 };
 
@@ -1049,25 +1062,17 @@ int bond_option_num_peer_notif_set(struct bonding *bond,
 }
 
 int bond_option_all_slaves_active_set(struct bonding *bond,
-                                     int all_slaves_active)
+                                     struct bond_opt_value *newval)
 {
        struct list_head *iter;
        struct slave *slave;
 
-       if (all_slaves_active == bond->params.all_slaves_active)
+       if (newval->value == bond->params.all_slaves_active)
                return 0;
-
-       if ((all_slaves_active == 0) || (all_slaves_active == 1)) {
-               bond->params.all_slaves_active = all_slaves_active;
-       } else {
-               pr_info("%s: Ignoring invalid all_slaves_active value %d.\n",
-                       bond->dev->name, all_slaves_active);
-               return -EINVAL;
-       }
-
+       bond->params.all_slaves_active = newval->value;
        bond_for_each_slave(bond, slave, iter) {
                if (!bond_is_active_slave(slave)) {
-                       if (all_slaves_active)
+                       if (newval->value)
                                slave->inactive = 0;
                        else
                                slave->inactive = 1;

diff --git a/drivers/net/bonding/bond_options.h b/drivers/net/bonding/bond_options.h
index 396d504214e498398baf93cda32e49dbbf476f16..09ee8c8bb19bd7f03e7c0684cf105ca35c68068d 100644 (file)
--- a/drivers/net/bonding/bond_options.h
+++ b/drivers/net/bonding/bond_options.h
@@ -58,6 +58,7 @@ enum {
        BOND_OPT_USE_CARRIER,
        BOND_OPT_ACTIVE_SLAVE,
        BOND_OPT_QUEUE_ID,
+       BOND_OPT_ALL_SLAVES_ACTIVE,
        BOND_OPT_LAST
 };
 
@@ -156,4 +157,6 @@ int bond_option_active_slave_set(struct bonding *bond,
                                 struct bond_opt_value *newval);
 int bond_option_queue_id_set(struct bonding *bond,
                             struct bond_opt_value *newval);
+int bond_option_all_slaves_active_set(struct bonding *bond,
+                                     struct bond_opt_value *newval);
 #endif /* _BOND_OPTIONS_H */

diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index a9cd3f514c8ccf5d4e7fb177902600db4dcdb4d7..20210d29e86bb2dc8bf0206f611a94eb33351bd1 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1015,22 +1015,13 @@ static ssize_t bonding_store_slaves_active(struct device *d,
                                           const char *buf, size_t count)
 {
        struct bonding *bond = to_bond(d);
-       int new_value, ret;
-
-       if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err("%s: no all_slaves_active value specified.\n",
-                      bond->dev->name);
-               return -EINVAL;
-       }
-
-       if (!rtnl_trylock())
-               return restart_syscall();
+       int ret;
 
-       ret = bond_option_all_slaves_active_set(bond, new_value);
+       ret = bond_opt_tryset_rtnl(bond, BOND_OPT_ALL_SLAVES_ACTIVE,
+                                  (char *)buf);
        if (!ret)
                ret = count;
 
-       rtnl_unlock();
        return ret;
 }
 static DEVICE_ATTR(all_slaves_active, S_IRUGO | S_IWUSR,

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 4ac79e1dd78ff79bac044269caa301cb20ca90dd..9801c5d6cee4a9d90c45e7137dca900bfa02b3c0 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -455,8 +455,6 @@ void bond_netlink_fini(void);
 int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);
 int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);
 int bond_option_resend_igmp_set(struct bonding *bond, int resend_igmp);
-int bond_option_all_slaves_active_set(struct bonding *bond,
-                                     int all_slaves_active);
 int bond_option_lp_interval_set(struct bonding *bond, int min_links);
 struct net_device *bond_option_active_slave_get_rcu(struct bonding *bond);
 struct net_device *bond_option_active_slave_get(struct bonding *bond);