Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755747AbXJIWpZ (ORCPT ); Tue, 9 Oct 2007 18:45:25 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752833AbXJIWpL (ORCPT ); Tue, 9 Oct 2007 18:45:11 -0400 Received: from cassiel.sirena.org.uk ([80.68.93.111]:1944 "EHLO cassiel.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752754AbXJIWpJ (ORCPT ); Tue, 9 Oct 2007 18:45:09 -0400 X-Greylist: delayed 1985 seconds by postgrey-1.27 at vger.kernel.org; Tue, 09 Oct 2007 18:45:09 EDT From: Mark Brown To: jgarzik@pobox.com, thockin@hockin.org Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Mark Brown Date: Tue, 9 Oct 2007 22:57:39 +0100 Message-Id: <1191967059-7143-2-git-send-email-broonie@sirena.org.uk> X-Mailer: git-send-email 1.5.3.4 In-Reply-To: <1191967059-7143-1-git-send-email-broonie@sirena.org.uk> References: <1191967059-7143-1-git-send-email-broonie@sirena.org.uk> X-SA-Exim-Connect-IP: 82.32.140.119 X-SA-Exim-Mail-From: broonie@sirena.org.uk Subject: [PATCH] natsemi: Use NATSEMI_TIMER_FREQ consistently X-SA-Exim-Version: 4.2.1 (built Tue, 09 Jan 2007 17:23:22 +0000) X-SA-Exim-Scanned: Yes (on cassiel.sirena.org.uk) Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1445 Lines: 40 The natsemi driver has a define NATSEMI_TIMER_FREQ which looks like it controls the normal frequency of the chip poll timer but in fact only takes effect for the first run of the timer. Adjust the value of the define to match that used by the timer and use the define consistently. Signed-off-by: Mark Brown --- drivers/net/natsemi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 0b33a58..1f88604 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c @@ -108,7 +108,7 @@ static int full_duplex[MAX_UNITS]; #define TX_TIMEOUT (2*HZ) #define NATSEMI_HW_TIMEOUT 400 -#define NATSEMI_TIMER_FREQ 3*HZ +#define NATSEMI_TIMER_FREQ 5*HZ #define NATSEMI_PG0_NREGS 64 #define NATSEMI_RFDR_NREGS 8 #define NATSEMI_PG1_NREGS 4 @@ -1797,7 +1797,7 @@ static void netdev_timer(unsigned long data) struct net_device *dev = (struct net_device *)data; struct netdev_private *np = netdev_priv(dev); void __iomem * ioaddr = ns_ioaddr(dev); - int next_tick = 5*HZ; + int next_tick = NATSEMI_TIMER_FREQ; if (netif_msg_timer(np)) { /* DO NOT read the IntrStatus register, -- 1.5.3.4 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/