From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from static-ip-62-75-166-246.inaddr.intergenia.de ([62.75.166.246]:55345 "EHLO vs166246.vserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757963AbXJOMx6 (ORCPT ); Mon, 15 Oct 2007 08:53:58 -0400 From: Michael Buesch To: John Linville Subject: [PATCH] b43: jiffies_round -> jiffies_round_relative conversion - b43/b43legacy Date: Mon, 15 Oct 2007 14:52:57 +0200 Cc: linux-wireless@vger.kernel.org, bcm43xx-dev@lists.berlios.de, Larry Finger , Anton Blanchard MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Message-Id: <200710151452.58150.mb@bu3sch.de> (sfid-20071015_135400_220989_6F204EEC) Sender: linux-wireless-owner@vger.kernel.org List-ID: When rounding a relative timeout we need to use round_jiffies_relative(). Signed-off-by: Anton Blanchard Signed-off-by: Michael Buesch --- diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index c141a26..41049a4 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -2392,7 +2392,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 f074951..bd0bd9b 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: ------------------------------------------------------- -- Greetings Michael.