[PATCH] cli()/sti() fix for drivers/net/ewrk3.c

From: Denis Vlasenko (vda@port.imtp.ilyichevsk.odessa.ua)
Date: Wed Oct 02 2002 - 19:59:01 EST

These are my first patches for network drivers.
Please comment if I'm doing something wrong.
Compile tested. Testers with hw wanted. 

--
vda

diff -u --recursive linux-2.5.38orig/drivers/net/ewrk3.c linux-2.5.38/drivers/net/ewrk3.c
--- linux-2.5.38orig/drivers/net/ewrk3.c	Sun Sep 22 04:25:09 2002
+++ linux-2.5.38/drivers/net/ewrk3.c	Wed Oct  2 01:29:31 2002
@@ -1631,6 +1631,7 @@
 	u_long iobase = dev->base_addr;
 	int i, j, status = 0;
 	u_char csr;
+	unsigned long flags;
 	union ewrk3_addr {
 		u_char addr[HASH_TABLE_LEN * ETH_ALEN];
 		u_short val[(HASH_TABLE_LEN * ETH_ALEN) >> 1];
@@ -1746,18 +1747,18 @@

 		break;
 	case EWRK3_GET_STATS:	/* Get the driver statistics */
-		cli();
+		spin_lock_irqsave(&lp->hw_lock, flags);
 		ioc->len = sizeof(lp->pktStats);
 		if (copy_to_user(ioc->data, &lp->pktStats, ioc->len))
 			status = -EFAULT;
-		sti();
+		spin_unlock_irqrestore(&lp->hw_lock,flags);

 		break;
 	case EWRK3_CLR_STATS:	/* Zero out the driver statistics */
 		if (capable(CAP_NET_ADMIN)) {
-			cli();
+			spin_lock_irqsave(&lp->hw_lock, flags);
 			memset(&lp->pktStats, 0, sizeof(lp->pktStats));
-			sti();
+			spin_unlock_irqrestore(&lp->hw_lock,flags);
 		} else {
 			status = -EPERM;
 		}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

This archive was generated by hypermail 2b29 : Mon Oct 07 2002 - 22:00:35 EST