diff options
| author | Nikolay Aleksandrov | 2014-01-22 14:53:26 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-23 00:38:42 +0100 |
| commit | e499461275023e20c4aecb6a546e7e213631b99f (patch) | |
| tree | 9c51e9a9740b5a0b16ebe0b80cb9f33732812860 /drivers/net/bonding/bond_sysfs.c | |
| parent | bonding: convert downdelay to use the new option API (diff) | |
| download | kernel-qcow2-linux-e499461275023e20c4aecb6a546e7e213631b99f.tar.gz kernel-qcow2-linux-e499461275023e20c4aecb6a546e7e213631b99f.tar.xz kernel-qcow2-linux-e499461275023e20c4aecb6a546e7e213631b99f.zip | |
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>
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 b4f67132b3ba..b873a88c3e2e 100644 --- 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, |