natsemi: Use NATSEMI_TIMER_FREQ consistently (f2cade13) · Commits · 戴 / test

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>

drivers/net/natsemi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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,

Admin message