aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2007-10-09 17:57:39 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:55:29 -0400
commitf2cade13371f3ca80c5479c284e6455c681c8a0c (patch)
tree752a69fe51c599c5f254a26da8abf7519df9ad4c /drivers/net
parent9265fabf0d4c3d0a52e169d4b9149d52fd91db69 (diff)
natsemi: Use NATSEMI_TIMER_FREQ consistently
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 <broonie@sirena.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/natsemi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index 322d16974000..527f9dcc7f69 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -108,7 +108,7 @@ static int full_duplex[MAX_UNITS];
108#define TX_TIMEOUT (2*HZ) 108#define TX_TIMEOUT (2*HZ)
109 109
110#define NATSEMI_HW_TIMEOUT 400 110#define NATSEMI_HW_TIMEOUT 400
111#define NATSEMI_TIMER_FREQ 3*HZ 111#define NATSEMI_TIMER_FREQ 5*HZ
112#define NATSEMI_PG0_NREGS 64 112#define NATSEMI_PG0_NREGS 64
113#define NATSEMI_RFDR_NREGS 8 113#define NATSEMI_RFDR_NREGS 8
114#define NATSEMI_PG1_NREGS 4 114#define NATSEMI_PG1_NREGS 4
@@ -1798,7 +1798,7 @@ static void netdev_timer(unsigned long data)
1798 struct net_device *dev = (struct net_device *)data; 1798 struct net_device *dev = (struct net_device *)data;
1799 struct netdev_private *np = netdev_priv(dev); 1799 struct netdev_private *np = netdev_priv(dev);
1800 void __iomem * ioaddr = ns_ioaddr(dev); 1800 void __iomem * ioaddr = ns_ioaddr(dev);
1801 int next_tick = 5*HZ; 1801 int next_tick = NATSEMI_TIMER_FREQ;
1802 1802
1803 if (netif_msg_timer(np)) { 1803 if (netif_msg_timer(np)) {
1804 /* DO NOT read the IntrStatus register, 1804 /* DO NOT read the IntrStatus register,