bonding: convert updelay to use the new option API

This patch adds the necessary changes so updelay would use
the new bonding option API. Also some trivial style fixes.

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 f30397e7131faa41638c1e7671376de64d23aace..9629088cb990386308a873008f5f113d4dbb50e3 100644 (file)
--- a/drivers/net/bonding/bond_netlink.c
+++ b/drivers/net/bonding/bond_netlink.c
@@ -139,7 +139,8 @@ static int bond_changelink(struct net_device *bond_dev,
        if (data[IFLA_BOND_UPDELAY]) {
                int updelay = nla_get_u32(data[IFLA_BOND_UPDELAY]);
 
-               err = bond_option_updelay_set(bond, updelay);
+               bond_opt_initval(&newval, updelay);
+               err = __bond_opt_set(bond, BOND_OPT_UPDELAY, &newval);
                if (err)
                        return err;
        }

diff --git a/drivers/net/bonding/bond_options.c b/drivers/net/bonding/bond_options.c
index 03514f7e17b9bb20e83c5be270370148863221e8..9cc21628032facc6d47fe22384b64a47ef52f078 100644 (file)
--- a/drivers/net/bonding/bond_options.c
+++ b/drivers/net/bonding/bond_options.c
@@ -142,6 +142,14 @@ static struct bond_option bond_opts[] = {
                .values = bond_intmax_tbl,
                .set = bond_option_downdelay_set
        },
+       [BOND_OPT_UPDELAY] = {
+               .id = BOND_OPT_UPDELAY,
+               .name = "updelay",
+               .desc = "Delay before considering link up, in milliseconds",
+               .values = bond_intmax_tbl,
+               .set = bond_option_updelay_set
+       },
+
        { }
 };
 
@@ -558,31 +566,24 @@ int bond_option_miimon_set(struct bonding *bond, int miimon)
        return 0;
 }
 
-int bond_option_updelay_set(struct bonding *bond, int updelay)
+int bond_option_updelay_set(struct bonding *bond, struct bond_opt_value *newval)
 {
-       if (!(bond->params.miimon)) {
+       if (!bond->params.miimon) {
                pr_err("%s: Unable to set up delay as MII monitoring is disabled\n",
                       bond->dev->name);
                return -EPERM;
        }
-
-       if (updelay < 0) {
-               pr_err("%s: Invalid up delay value %d not in range %d-%d; rejected.\n",
-                      bond->dev->name, updelay, 0, INT_MAX);
-               return -EINVAL;
-       } else {
-               if ((updelay % bond->params.miimon) != 0) {
-                       pr_warn("%s: Warning: up delay (%d) is not a multiple of miimon (%d), updelay rounded to %d ms\n",
-                               bond->dev->name, updelay,
-                               bond->params.miimon,
-                               (updelay / bond->params.miimon) *
-                               bond->params.miimon);
-               }
-               bond->params.updelay = updelay / bond->params.miimon;
-               pr_info("%s: Setting up delay to %d.\n",
-                       bond->dev->name,
-                       bond->params.updelay * bond->params.miimon);
+       if ((newval->value % bond->params.miimon) != 0) {
+               pr_warn("%s: Warning: up delay (%llu) is not a multiple of miimon (%d), updelay rounded to %llu ms\n",
+                       bond->dev->name, newval->value,
+                       bond->params.miimon,
+                       (newval->value / bond->params.miimon) *
+                       bond->params.miimon);
        }
+       bond->params.updelay = newval->value / bond->params.miimon;
+       pr_info("%s: Setting up delay to %d.\n",
+               bond->dev->name,
+               bond->params.updelay * bond->params.miimon);
 
        return 0;
 }

diff --git a/drivers/net/bonding/bond_options.h b/drivers/net/bonding/bond_options.h
index 5a3f4053811d179095e8f5a4e16465a882e90165..594046c3a6089bc7b7a57e8297f6a53e8e9c0551 100644 (file)
--- a/drivers/net/bonding/bond_options.h
+++ b/drivers/net/bonding/bond_options.h
@@ -47,6 +47,7 @@ enum {
        BOND_OPT_ARP_INTERVAL,
        BOND_OPT_ARP_TARGETS,
        BOND_OPT_DOWNDELAY,
+       BOND_OPT_UPDELAY,
        BOND_OPT_LAST
 };
 
@@ -124,4 +125,6 @@ int bond_option_arp_ip_targets_set(struct bonding *bond,
 void bond_option_arp_ip_targets_clear(struct bonding *bond);
 int bond_option_downdelay_set(struct bonding *bond,
                              struct bond_opt_value *newval);
+int bond_option_updelay_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 b4f67132b3ba1a4b4efd706efb015187f0b4214a..b873a88c3e2ecbd304504e5bd70ca04805c90660 100644 (file)
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -527,23 +527,13 @@ static ssize_t bonding_store_updelay(struct device *d,
                                     struct device_attribute *attr,
                                     const char *buf, size_t count)
 {
-       int new_value, ret;
        struct bonding *bond = to_bond(d);
+       int ret;
 
-       if (sscanf(buf, "%d", &new_value) != 1) {
-               pr_err("%s: no up delay value specified.\n",
-               bond->dev->name);
-               return -EINVAL;
-       }
-
-       if (!rtnl_trylock())
-               return restart_syscall();
-
-       ret = bond_option_updelay_set(bond, new_value);
+       ret = bond_opt_tryset_rtnl(bond, BOND_OPT_UPDELAY, (char *)buf);
        if (!ret)
                ret = count;
 
-       rtnl_unlock();
        return ret;
 }
 static DEVICE_ATTR(updelay, S_IRUGO | S_IWUSR,

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index 6286bb7b20925263da53c8f613f614bcff3b8919..f2b127060c9039ea6b1044030b7b6aad2523a0b3 100644 (file)
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -454,7 +454,6 @@ int bond_netlink_init(void);
 void bond_netlink_fini(void);
 int bond_option_active_slave_set(struct bonding *bond, struct net_device *slave_dev);
 int bond_option_miimon_set(struct bonding *bond, int miimon);
-int bond_option_updelay_set(struct bonding *bond, int updelay);
 int bond_option_use_carrier_set(struct bonding *bond, int use_carrier);
 int bond_option_arp_ip_target_add(struct bonding *bond, __be32 target);
 int bond_option_arp_ip_target_rem(struct bonding *bond, __be32 target);