[PATCH 2.4] more net driver timer fixes

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

the 2.4 version of my 2.5 patch.
jiffies usage fixes for:
	edited/appletalk/cops.c
	edited/appletalk/ltpc.c
	edited/declance.c
	edited/sb1250-mac.c
	edited/sk_mca.c
	edited/via-rhine.c

--- 1.7/drivers/net/appletalk/cops.c	Tue Feb  5 08:45:05 2002
+++ edited/appletalk/cops.c	Fri Jul 11 18:39:08 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.4/drivers/net/appletalk/ltpc.c	Tue Feb  5 08:45:05 2002
+++ edited/appletalk/ltpc.c	Fri Jul 11 18:39:08 2003
@@ -929,8 +929,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);
 }
@@ -1210,7 +1211,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);
 		restore_flags(flags); 
 	}
--- 1.12/drivers/net/declance.c	Mon Jan  6 16:38:18 2003
+++ edited/declance.c	Fri Jul 11 18:39:08 2003
@@ -972,7 +972,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.3/drivers/net/sb1250-mac.c	Tue Aug 20 05:41:52 2002
+++ edited/sb1250-mac.c	Fri Jul 11 18:39:08 2003
@@ -2511,7 +2511,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.4/drivers/net/sk_mca.c	Tue Feb  5 08:52:40 2002
+++ edited/sk_mca.c	Fri Jul 11 18:39:08 2003
@@ -539,7 +539,7 @@
 	ResetBoard(dev);
 	InitBoard(dev);
 
-	njiffies = jiffies + 100;
+	njiffies = jiffies + HZ;
 	do {
 		csr0val = GetLANCE(dev, LANCE_CSR0);
 	}
--- 1.39/drivers/net/via-rhine.c	Fri Jul  4 15:00:51 2003
+++ edited/via-rhine.c	Fri Jul 11 18:39:08 2003
@@ -1151,7 +1151,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