patch-2.1.30 linux/drivers/net/de4x5.c

Next file: linux/drivers/net/hdlcdrv.c
Previous file: linux/drivers/net/bpqether.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.29/linux/drivers/net/de4x5.c linux/drivers/net/de4x5.c
@@ -1380,6 +1380,8 @@
 		   dev->name, sts);
 	    return;
 	}
+if (sts & (STS_AIS | STS_UNF | STS_SE | STS_LNF | STS_RWT | STS_RU | STS_TJT))
+	printk("STS=%08x\n",sts);
     }
 
     /* Load the TX ring with any locally stored packets */
@@ -1563,7 +1565,10 @@
 	if ((omr & OMR_TR) < OMR_TR) {
 	    omr += 0x4000;
 	} else {
-	    omr |= OMR_SF;
+	    if (omr & OMR_TTM)
+		omr &= ~OMR_TTM;
+	    else
+		omr |= OMR_SF;
 	}
 	outl(omr | OMR_ST | OMR_SR, DE4X5_OMR);
     }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov