diff options
author | Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 17:53:31 +0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-23 03:38:43 +0400 |
commit | b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d (patch) | |
tree | f184fb9017994853bcbed1f208bb029a137617cc /drivers/net/bonding/bond_sysfs.c | |
parent | ef56becbb37251f0371ad94210f50dc90e18830a (diff) | |
download | linux-b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d.tar.xz |
bonding: convert miimon to use the new option API
This patch adds the necessary changes so miimon would use
the new bonding option API. The "default" definition has been removed as
it was 0.
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 | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index e1c99db134a9..3f6e4d614a47 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -673,23 +673,13 @@ static ssize_t bonding_store_miimon(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 miimon value specified.\n", - bond->dev->name); - return -EINVAL; - } - - if (!rtnl_trylock()) - return restart_syscall(); - - ret = bond_option_miimon_set(bond, new_value); + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_MIIMON, (char *)buf); if (!ret) ret = count; - rtnl_unlock(); return ret; } static DEVICE_ATTR(miimon, S_IRUGO | S_IWUSR, |