diff options
| author | Nikolay Aleksandrov | 2014-01-22 14:53:21 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-23 00:38:42 +0100 |
| commit | edf36b24c58dbbd5f2e708096537bf0a88ffa477 (patch) | |
| tree | 0eb18f5930e6e524124df2fc0ac1dd99236fb3cd /drivers/net/bonding/bond_main.c | |
| parent | bonding: convert arp_validate to use the new option API (diff) | |
| download | kernel-qcow2-linux-edf36b24c58dbbd5f2e708096537bf0a88ffa477.tar.gz kernel-qcow2-linux-edf36b24c58dbbd5f2e708096537bf0a88ffa477.tar.xz kernel-qcow2-linux-edf36b24c58dbbd5f2e708096537bf0a88ffa477.zip | |
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_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 3903c87c8b8c..103b6af30474 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -214,12 +214,6 @@ const struct bond_parm_tbl bond_lacp_tbl[] = { { NULL, -1}, }; -const struct bond_parm_tbl arp_all_targets_tbl[] = { -{ "any", BOND_ARP_TARGETS_ANY}, -{ "all", BOND_ARP_TARGETS_ALL}, -{ NULL, -1}, -}; - const struct bond_parm_tbl fail_over_mac_tbl[] = { { "none", BOND_FOM_NONE}, { "active", BOND_FOM_ACTIVE}, @@ -4231,13 +4225,15 @@ static int bond_check_params(struct bond_params *params) arp_all_targets_value = 0; if (arp_all_targets) { - arp_all_targets_value = bond_parse_parm(arp_all_targets, - arp_all_targets_tbl); - - if (arp_all_targets_value == -1) { + bond_opt_initstr(&newval, arp_all_targets); + valptr = bond_opt_parse(bond_opt_get(BOND_OPT_ARP_ALL_TARGETS), + &newval); + if (!valptr) { pr_err("Error: invalid arp_all_targets_value \"%s\"\n", arp_all_targets); arp_all_targets_value = 0; + } else { + arp_all_targets_value = valptr->value; } } |