patch-2.3.43 linux/drivers/net/ne.c

Next file: linux/drivers/net/ne2k-pci.c
Previous file: linux/drivers/net/ncr885e.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.42/linux/drivers/net/ne.c linux/drivers/net/ne.c
@@ -606,9 +606,8 @@
 	if (ei_status.dmaing) 
 	{
 		printk(KERN_EMERG "%s: DMAing conflict in ne_get_8390_hdr "
-			"[DMAstat:%d][irqlock:%d][intr:%ld].\n",
-			dev->name, ei_status.dmaing, ei_status.irqlock,
-			dev->interrupt);
+			"[DMAstat:%d][irqlock:%d].\n",
+			dev->name, ei_status.dmaing, ei_status.irqlock);
 		return;
 	}
 
@@ -646,9 +645,8 @@
 	if (ei_status.dmaing) 
 	{
 		printk(KERN_EMERG "%s: DMAing conflict in ne_block_input "
-			"[DMAstat:%d][irqlock:%d][intr:%ld].\n",
-			dev->name, ei_status.dmaing, ei_status.irqlock,
-			dev->interrupt);
+			"[DMAstat:%d][irqlock:%d].\n",
+			dev->name, ei_status.dmaing, ei_status.irqlock);
 		return;
 	}
 	ei_status.dmaing |= 0x01;
@@ -721,9 +719,8 @@
 	if (ei_status.dmaing) 
 	{
 		printk(KERN_EMERG "%s: DMAing conflict in ne_block_output."
-			"[DMAstat:%d][irqlock:%d][intr:%ld]\n",
-			dev->name, ei_status.dmaing, ei_status.irqlock,
-			dev->interrupt);
+			"[DMAstat:%d][irqlock:%d]\n",
+			dev->name, ei_status.dmaing, ei_status.irqlock);
 		return;
 	}
 	ei_status.dmaing |= 0x01;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)