diff options
| author | Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 17:53:34 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-23 03:38:43 +0400 |
| commit | 0fff060877426f3faf6754c201e28cd5b34756c0 (patch) | |
| tree | fa4c65b3091a5a8d244e1932c0ce27391aba4c84 /drivers/net/bonding/bond_sysfs.c | |
| parent | 388d3a6d4aa356b885bcd023c185060df9ea2484 (diff) | |
| download | linux-0fff060877426f3faf6754c201e28cd5b34756c0.tar.xz | |
bonding: convert use_carrier to use the new option API
This patch adds the necessary changes so use_carrier would use
the new bonding option API.
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 7f307bf096d1..004048240def 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -772,23 +772,13 @@ static ssize_t bonding_store_carrier(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 use_carrier value specified.\n", - bond->dev->name); - return -EINVAL; - } - - if (!rtnl_trylock()) - return restart_syscall(); - - ret = bond_option_use_carrier_set(bond, new_value); + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_USE_CARRIER, (char *)buf); if (!ret) ret = count; - rtnl_unlock(); return ret; } static DEVICE_ATTR(use_carrier, S_IRUGO | S_IWUSR, |