patch-1.3.49 linux/drivers/net/3c503.c

• Lines: 25
• Date: Mon Dec 18 08:53:24 1995
• Orig file: v1.3.48/linux/drivers/net/3c503.c
• Orig date: Wed Dec 13 09:02:46 1995

diff -u --recursive --new-file v1.3.48/linux/drivers/net/3c503.c linux/drivers/net/3c503.c
@@ -475,6 +475,7 @@
 {
     unsigned int i;
     unsigned long hdr_start = dev->mem_start + ((ring_page - EL2_MB1_START_PG)<<8);
+    unsigned long fifo_watchdog;
 
     if (dev->mem_start) {       /* Use the shared memory. */
 #ifdef notdef
@@ -492,7 +493,15 @@
     outb_p((ei_status.interface_num == 0 ? ECNTRL_THIN : ECNTRL_AUI) | ECNTRL_INPUT
 	   | ECNTRL_START, E33G_CNTRL);
 
-    /* Header is less than 8 bytes, so we can ignore the FIFO. */
+    /* Header is < 8 bytes, so only check the FIFO at the beginning. */
+    fifo_watchdog = jiffies;
+    while ((inb(E33G_STATUS) & ESTAT_DPRDY) == 0) {
+	if (jiffies - fifo_watchdog > 2*HZ/100) {
+		printk("%s: FIFO blocked in el2_get_8390_hdr.\n", dev->name);
+		break;
+	}
+    }
+
     for(i = 0; i < sizeof(struct e8390_pkt_hdr); i++)
 	((char *)(hdr))[i] = inb_p(E33G_FIFOH);