diff options
| author | Anton Blanchard | 2007-10-15 07:42:23 +0200 |
|---|---|---|
| committer | John W. Linville | 2007-10-26 04:05:36 +0200 |
| commit | 82cd682d56e2a6bbb46d31076cdd9a62c667a2b4 (patch) | |
| tree | 4f1fc9ada9f5b22ab43c0f99420479d8a44e0374 /drivers/net | |
| parent | [PATCH] rt2x00: jiffies_round -> jiffies_round_relative (diff) | |
| download | kernel-qcow2-linux-82cd682d56e2a6bbb46d31076cdd9a62c667a2b4.tar.gz kernel-qcow2-linux-82cd682d56e2a6bbb46d31076cdd9a62c667a2b4.tar.xz kernel-qcow2-linux-82cd682d56e2a6bbb46d31076cdd9a62c667a2b4.zip | |
[PATCH] b43/b43legacy: jiffies_round -> jiffies_round_relative
When rounding a relative timeout we need to use round_jiffies_relative().
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 2 | ||||
| -rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 9d9ff76a9bc6..5058e60e5703 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2391,7 +2391,7 @@ out_requeue: if (b43_debug(dev, B43_DBG_PWORK_FAST)) delay = msecs_to_jiffies(50); else - delay = round_jiffies(HZ * 15); + delay = round_jiffies_relative(HZ * 15); queue_delayed_work(wl->hw->workqueue, &dev->periodic_work, delay); out: mutex_unlock(&wl->mutex); diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index d09479e816cd..f0e56dfc9ecf 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c @@ -2260,7 +2260,7 @@ out_requeue: if (b43legacy_debug(dev, B43legacy_DBG_PWORK_FAST)) delay = msecs_to_jiffies(50); else - delay = round_jiffies(HZ); + delay = round_jiffies_relative(HZ); queue_delayed_work(dev->wl->hw->workqueue, &dev->periodic_work, delay); out: |