patch-2.3.99-pre3 linux/drivers/net/tulip/interrupt.c

• Lines: 22
• Date: Tue Mar 21 12:39:17 2000
• Orig file: v2.3.99-pre2/linux/drivers/net/tulip/interrupt.c
• Orig date: Sun Mar 19 18:35:30 2000

diff -u --recursive --new-file v2.3.99-pre2/linux/drivers/net/tulip/interrupt.c linux/drivers/net/tulip/interrupt.c
@@ -14,7 +14,6 @@
 */
 
 #include "tulip.h"
-#include <asm/io.h>
 #include <linux/etherdevice.h>
 #include <linux/pci.h>
 
@@ -211,9 +210,12 @@
 
 				if (status < 0)
 					break;			/* It still has not been Txed */
+
 				/* Check for Rx filter setup frames. */
 				if (tp->tx_buffers[entry].skb == NULL) {
-					pci_unmap_single(tp->pdev,
+					/* test because dummy frames not mapped */
+					if (tp->tx_buffers[entry].mapping)
+						pci_unmap_single(tp->pdev,
 							 tp->tx_buffers[entry].mapping,
 							 sizeof(tp->setup_frame),
 							 PCI_DMA_TODEVICE);