diff options
author | Nikolay Aleksandrov <nikolay@redhat.com> | 2014-01-22 13:53:21 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-01-22 23:38:42 (GMT) |
commit | edf36b24c58dbbd5f2e708096537bf0a88ffa477 (patch) | |
tree | 0eb18f5930e6e524124df2fc0ac1dd99236fb3cd /drivers/net/bonding/bond_sysfs.c | |
parent | 162288810c9ebd2efb79ee6dc364e266044cac9e (diff) | |
download | linux-edf36b24c58dbbd5f2e708096537bf0a88ffa477.tar.xz |
bonding: convert arp_all_targets to use the new option API
This patch adds the necessary changes so arp_all_targets 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 | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c index e1a4b63..83463fc 100644 --- a/drivers/net/bonding/bond_sysfs.c +++ b/drivers/net/bonding/bond_sysfs.c @@ -357,10 +357,12 @@ static ssize_t bonding_show_arp_all_targets(struct device *d, char *buf) { struct bonding *bond = to_bond(d); - int value = bond->params.arp_all_targets; + struct bond_opt_value *val; - return sprintf(buf, "%s %d\n", arp_all_targets_tbl[value].modename, - value); + val = bond_opt_get_val(BOND_OPT_ARP_ALL_TARGETS, + bond->params.arp_all_targets); + return sprintf(buf, "%s %d\n", + val->string, bond->params.arp_all_targets); } static ssize_t bonding_store_arp_all_targets(struct device *d, @@ -368,24 +370,12 @@ static ssize_t bonding_store_arp_all_targets(struct device *d, const char *buf, size_t count) { struct bonding *bond = to_bond(d); - int new_value, ret; - - new_value = bond_parse_parm(buf, arp_all_targets_tbl); - if (new_value < 0) { - pr_err("%s: Ignoring invalid arp_all_targets value %s\n", - bond->dev->name, buf); - return -EINVAL; - } - - if (!rtnl_trylock()) - return restart_syscall(); + int ret; - ret = bond_option_arp_all_targets_set(bond, new_value); + ret = bond_opt_tryset_rtnl(bond, BOND_OPT_ARP_ALL_TARGETS, (char *)buf); if (!ret) ret = count; - rtnl_unlock(); - return ret; } |