diff options
| author | Nikolay Aleksandrov | 2014-01-22 14:53:31 +0100 |
|---|---|---|
| committer | David S. Miller | 2014-01-23 00:38:43 +0100 |
| commit | b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d (patch) | |
| tree | f184fb9017994853bcbed1f208bb029a137617cc /drivers/net/bonding/bond_main.c | |
| parent | bonding: convert num_peer_notif to use the new option API (diff) | |
| download | kernel-qcow2-linux-b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d.tar.gz kernel-qcow2-linux-b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d.tar.xz kernel-qcow2-linux-b98d9c66e1c3823c50a3cd5e8e59f12b97d7ba5d.zip | |
bonding: convert miimon to use the new option API
This patch adds the necessary changes so miimon 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 8f3f9f046f1c..f606e2c3724c 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -86,12 +86,11 @@ /*---------------------------- Module parameters ----------------------------*/ /* monitor all links that often (in milliseconds). <=0 disables monitoring */ -#define BOND_LINK_MON_INTERV 0 static int max_bonds = BOND_DEFAULT_MAX_BONDS; static int tx_queues = BOND_DEFAULT_TX_QUEUES; static int num_peer_notif = 1; -static int miimon = BOND_LINK_MON_INTERV; +static int miimon; static int updelay; static int downdelay; static int use_carrier = 1; @@ -4046,9 +4045,9 @@ static int bond_check_params(struct bond_params *params) } if (miimon < 0) { - pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to %d\n", - miimon, INT_MAX, BOND_LINK_MON_INTERV); - miimon = BOND_LINK_MON_INTERV; + pr_warning("Warning: miimon module parameter (%d), not in range 0-%d, so it was reset to 0\n", + miimon, INT_MAX); + miimon = 0; } if (updelay < 0) { |