diff options
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r-- | drivers/net/bonding/bond_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 50a40e433154..12c71582f4f6 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c | |||
@@ -2397,7 +2397,7 @@ void bond_mii_monitor(struct work_struct *work) | |||
2397 | read_lock(&bond->lock); | 2397 | read_lock(&bond->lock); |
2398 | } | 2398 | } |
2399 | 2399 | ||
2400 | delay = ((bond->params.miimon * HZ) / 1000) ? : 1; | 2400 | delay = msecs_to_jiffies(bond->params.miimon); |
2401 | read_unlock(&bond->lock); | 2401 | read_unlock(&bond->lock); |
2402 | queue_delayed_work(bond->wq, &bond->mii_work, delay); | 2402 | queue_delayed_work(bond->wq, &bond->mii_work, delay); |
2403 | } | 2403 | } |
@@ -2707,7 +2707,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work) | |||
2707 | 2707 | ||
2708 | read_lock(&bond->lock); | 2708 | read_lock(&bond->lock); |
2709 | 2709 | ||
2710 | delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; | 2710 | delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval); |
2711 | 2711 | ||
2712 | if (bond->kill_timers) { | 2712 | if (bond->kill_timers) { |
2713 | goto out; | 2713 | goto out; |
@@ -2837,7 +2837,7 @@ void bond_activebackup_arp_mon(struct work_struct *work) | |||
2837 | 2837 | ||
2838 | read_lock(&bond->lock); | 2838 | read_lock(&bond->lock); |
2839 | 2839 | ||
2840 | delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; | 2840 | delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval); |
2841 | 2841 | ||
2842 | if (bond->kill_timers) { | 2842 | if (bond->kill_timers) { |
2843 | goto out; | 2843 | goto out; |