[Linux-mips-commits]CVS: linux/drivers/net/tulip interrupt.c,1.5,1.6 tulip_core.c,1.9,1.10

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/drivers/net/tulip
In directory usw-pr-cvs1:/tmp/cvs-serv23524/drivers/net/tulip

Modified Files:
	interrupt.c tulip_core.c 
Log Message:
Sync with OSS 2.4.14.



Index: interrupt.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/interrupt.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- interrupt.c	2001/10/22 19:17:55	1.5
+++ interrupt.c	2001/11/06 09:10:22	1.6
@@ -309,7 +309,7 @@
 	long ioaddr = dev->base_addr;
 	int csr5;
 	int entry;
-	int csr8;
+	int missed;
 	int rx = 0;
 	int tx = 0;
 	int oi = 0;
@@ -442,6 +442,7 @@
 				}
 			}
 			if (csr5 & RxDied) {		/* Missed a Rx frame. */
+                                tp->stats.rx_missed_errors += inl(ioaddr + CSR8) & 0xffff;
 #ifdef CONFIG_NET_HW_FLOWCONTROL
 				if (tp->fc_bit && !test_bit(tp->fc_bit, &netdev_fc_xoff)) {
 					tp->stats.rx_errors++;
@@ -555,8 +556,9 @@
 		}
 	}
 
-	csr8 = inl(ioaddr + CSR8);
-	tp->stats.rx_dropped += (csr8 & 0x1ffff) + ((csr8 >> 17) & 0xfff);
+	if ((missed = inl(ioaddr + CSR8) & 0x1ffff)) {
+		tp->stats.rx_dropped += missed & 0x10000 ? 0x10000 : missed;
+	}
 
 	if (tulip_debug > 4)
 		printk(KERN_DEBUG "%s: exiting interrupt, csr5=%#4.4x.\n",

Index: tulip_core.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/drivers/net/tulip/tulip_core.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- tulip_core.c	2001/11/06 00:30:45	1.9
+++ tulip_core.c	2001/11/06 09:10:22	1.10
@@ -15,8 +15,8 @@
 */
 
 #define DRV_NAME	"tulip"
-#define DRV_VERSION	"0.9.15-pre7"
-#define DRV_RELDATE	"Oct 2, 2001"
+#define DRV_VERSION	"0.9.15-pre8"
+#define DRV_RELDATE	"Oct 11, 2001"
 
 #include <linux/config.h>
 #include <linux/module.h>