From c11df93dd4ea145aa8e32d8eb9fa0429dc592be2 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 9 Oct 2007 22:57:39 +0100 Subject: [PATCH] --- yaml --- r: 67003 b: refs/heads/master c: f2cade13371f3ca80c5479c284e6455c681c8a0c h: refs/heads/master i: 67001: 5b1f74ae954045bf7516abc9f555bd8cf80f8d00 66999: ab332ac9000d4e13fe8c697234bb52a66e3fd6ac v: v3 --- [refs] | 2 +- trunk/drivers/net/natsemi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f9249b1d08a6..0b03cffc191c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9265fabf0d4c3d0a52e169d4b9149d52fd91db69 +refs/heads/master: f2cade13371f3ca80c5479c284e6455c681c8a0c diff --git a/trunk/drivers/net/natsemi.c b/trunk/drivers/net/natsemi.c index 322d16974000..527f9dcc7f69 100644 --- a/trunk/drivers/net/natsemi.c +++ b/trunk/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 @@ -1798,7 +1798,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,