From edb1f2c2b26b7efc75c01fb35c77188006791bb8 Mon Sep 17 00:00:00 2001 From: Jay Vosburgh Date: Sat, 17 May 2008 21:10:07 -0700 Subject: [PATCH] --- yaml --- r: 102633 b: refs/heads/master c: 5ce0da8f0386b62345312ec8fed31303732f4220 h: refs/heads/master i: 102631: d74b29b9ceebc58c7ced31fed3c99cb22011f928 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bond_main.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bc556711c295..5e06c603ad75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d63ddcec20f59e78212aeaf5144e9652c0097211 +refs/heads/master: 5ce0da8f0386b62345312ec8fed31303732f4220 diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c index 50a40e433154..12c71582f4f6 100644 --- a/trunk/drivers/net/bonding/bond_main.c +++ b/trunk/drivers/net/bonding/bond_main.c @@ -2397,7 +2397,7 @@ void bond_mii_monitor(struct work_struct *work) read_lock(&bond->lock); } - delay = ((bond->params.miimon * HZ) / 1000) ? : 1; + delay = msecs_to_jiffies(bond->params.miimon); read_unlock(&bond->lock); queue_delayed_work(bond->wq, &bond->mii_work, delay); } @@ -2707,7 +2707,7 @@ void bond_loadbalance_arp_mon(struct work_struct *work) read_lock(&bond->lock); - delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; + delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval); if (bond->kill_timers) { goto out; @@ -2837,7 +2837,7 @@ void bond_activebackup_arp_mon(struct work_struct *work) read_lock(&bond->lock); - delta_in_ticks = (bond->params.arp_interval * HZ) / 1000; + delta_in_ticks = msecs_to_jiffies(bond->params.arp_interval); if (bond->kill_timers) { goto out;