[PATCH 2.5] more net driver timer fixes

[Daniel Ritz <daniel.ritz@gmx.ch>]

following patch fixes some bogus additions to jiffies (w/o HZ beeing involved)
- appletalk/cops.c
- appletalk/ltpc.c
- declance.c
- sb1250-mac.c
- sk_mca.c
- via-rhine.c
against 2.5.73-bk


--- 1.16/drivers/net/appletalk/cops.c	Mon Apr 28 05:36:18 2003
+++ edited/cops.c	Tue Jul  1 23:09:19 2003
@@ -424,7 +424,7 @@
 		    init_timer(&cops_timer);
 		    cops_timer.function = cops_poll;
 		    cops_timer.data 	= (unsigned long)dev;
-		    cops_timer.expires 	= jiffies + 5;
+		    cops_timer.expires 	= jiffies + HZ/20;
 		    add_timer(&cops_timer);
 		} 
 		else 
@@ -700,7 +700,8 @@
 		status = inb(ioaddr+TANG_CARD_STATUS);
 	} while((++boguscount < 20) && (status&(TANG_RX_READY|TANG_TX_READY)));
 
-	cops_timer.expires = jiffies+5;
+	/* poll 20 times per second */
+	cops_timer.expires = jiffies + HZ/20;
 	add_timer(&cops_timer);
 
 	return;
--- 1.11/drivers/net/appletalk/ltpc.c	Mon Apr 28 05:36:18 2003
+++ edited/ltpc.c	Tue Jul  1 23:10:07 2003
@@ -926,8 +926,9 @@
 	if (!dev)
 		return;  /* we've been downed */
 
+	/* poll 20 times per second */
 	idle(dev);
-	ltpc_timer.expires = jiffies+5;
+	ltpc_timer.expires = jiffies + HZ/20;
 	
 	add_timer(&ltpc_timer);
 }
@@ -1217,7 +1218,7 @@
 		ltpc_timer.function=ltpc_poll;
 		ltpc_timer.data = (unsigned long) dev;
 
-		ltpc_timer.expires = jiffies + 5;
+		ltpc_timer.expires = jiffies + HZ/20;
 		add_timer(&ltpc_timer);
 	}
 
--- 1.16/drivers/net/declance.c	Wed Jun 25 23:05:16 2003
+++ edited/declance.c	Tue Jul  1 23:16:27 2003
@@ -992,7 +992,7 @@
 		return;
 
 	if (lp->tx_old != lp->tx_new) {
-		mod_timer(&lp->multicast_timer, jiffies + 4);
+		mod_timer(&lp->multicast_timer, jiffies + 4 * HZ/100);
 		netif_wake_queue(dev);
 		return;
 	}
--- 1.5/drivers/net/sb1250-mac.c	Wed Jun 25 23:09:38 2003
+++ edited/sb1250-mac.c	Tue Jul  1 23:24:20 2003
@@ -2493,7 +2493,7 @@
 	
 	/* Set the timer to check for link beat. */
 	init_timer(&sc->sbm_timer);
-	sc->sbm_timer.expires = jiffies + 2;
+	sc->sbm_timer.expires = jiffies + 2 * HZ/100;
 	sc->sbm_timer.data = (unsigned long)dev;
 	sc->sbm_timer.function = &sbmac_timer;
 	add_timer(&sc->sbm_timer);
--- 1.10/drivers/net/sk_mca.c	Mon Apr 28 05:36:20 2003
+++ edited/sk_mca.c	Tue Jul  1 23:26:16 2003
@@ -537,7 +537,7 @@
 	ResetBoard(dev);
 	InitBoard(dev);
 
-	njiffies = jiffies + 100;
+	njiffies = jiffies + HZ;
 	do {
 		csr0val = GetLANCE(dev, LANCE_CSR0);
 	}
--- 1.41/drivers/net/via-rhine.c	Wed May 21 05:02:20 2003
+++ edited/via-rhine.c	Tue Jul  1 23:28:53 2003
@@ -1145,7 +1145,7 @@
 
 	/* Set the timer to check for link beat. */
 	init_timer(&np->timer);
-	np->timer.expires = jiffies + 2;
+	np->timer.expires = jiffies + 2 * HZ/100;
 	np->timer.data = (unsigned long)dev;
 	np->timer.function = &via_rhine_timer;				/* timer handler */
 	add_timer(&np->timer);

-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html