diff options
author | Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 17:53:25 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-23 03:38:42 +0400 |
commit | 25a9b54a4b4a996e5a996c1e841c265d40db1d40 (patch) | |
tree | dbd8f877a0893d7c900b63684c3d274932796466 /drivers/net/bonding/bond_sysfs.c | |
parent | 4fb0ef585eb2825ef4e542c2b1d302dc53f36860 (diff) | |
download | linux-25a9b54a4b4a996e5a996c1e841c265d40db1d40.tar.xz |
bonding: convert downdelay to use the new option API
This patch adds the necessary changes so downdelay 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>
Diffstat (limited to 'drivers/net/bonding/bond_sysfs.c')
-rw-r--r-- | drivers/net/bonding/bond_sysfs.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index 5eeb3a2add02..b4f67132b3ba 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -501,22 +501,13 @@ static ssize_t bonding_store_downdelay(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 down delay value specified.\n", bond->dev->name); - return -EINVAL; - } - - if (!rtnl_trylock()) - return restart_syscall(); - - ret = bond_option_downdelay_set(bond, new_value); + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_DOWNDELAY, (char *)buf); if (!ret) ret = count; - rtnl_unlock(); return ret; } static DEVICE_ATTR(downdelay, S_IRUGO | S_IWUSR, |