diff options
| author | Nikolay Aleksandrov | 2014-01-22 14:53:23 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-23 00:38:42 +0100 |
| commit | 7bdb04ed0dbf9f0e94110be43db4f8bb7df58de2 (patch) | |
| tree | 32d3faa0349f33912923606058c082bcf712437d /drivers/net/bonding/bond_main.c | |
| parent | bonding: convert fail_over_mac to use the new option API (diff) | |
| download | kernel-qcow2-linux-7bdb04ed0dbf9f0e94110be43db4f8bb7df58de2.tar.gz kernel-qcow2-linux-7bdb04ed0dbf9f0e94110be43db4f8bb7df58de2.tar.xz kernel-qcow2-linux-7bdb04ed0dbf9f0e94110be43db4f8bb7df58de2.zip | |
bonding: convert arp_interval to use the new option API
This patch adds the necessary changes so arp_interval 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_main.c')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 4fe3634a77d3..6d1515db6ca8 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -87,7 +87,6 @@ /* monitor all links that often (in milliseconds). <=0 disables monitoring */ #define BOND_LINK_MON_INTERV 0 -#define BOND_LINK_ARP_INTERV 0 static int max_bonds = BOND_DEFAULT_MAX_BONDS; static int tx_queues = BOND_DEFAULT_TX_QUEUES; @@ -103,7 +102,7 @@ static char *lacp_rate; static int min_links; static char *ad_select; static char *xmit_hash_policy; -static int arp_interval = BOND_LINK_ARP_INTERV; +static int arp_interval; static char *arp_ip_target[BOND_MAX_ARP_TARGETS]; static char *arp_validate; static char *arp_all_targets; @@ -4162,9 +4161,9 @@ static int bond_check_params(struct bond_params *params) } if (arp_interval < 0) { - pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to %d\n", - arp_interval, INT_MAX, BOND_LINK_ARP_INTERV); - arp_interval = BOND_LINK_ARP_INTERV; + pr_warning("Warning: arp_interval module parameter (%d) , not in range 0-%d, so it was reset to 0\n", + arp_interval, INT_MAX); + arp_interval = 0; } for (arp_ip_count = 0, i = 0; |