patch-2.3.44 linux/drivers/net/rtl8139.c

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

diff -u --recursive --new-file v2.3.43/linux/drivers/net/rtl8139.c linux/drivers/net/rtl8139.c
@@ -96,11 +96,6 @@
 #else
 #define PCI_SUPPORT_VER2
 #endif
-#if LINUX_VERSION_CODE < 0x20159
-#define dev_free_skb(skb) dev_kfree_skb(skb, FREE_WRITE);
-#else
-#define dev_free_skb(skb) dev_kfree_skb(skb);
-#endif
 
 /* The I/O extent. */
 #define RTL8129_TOTAL_SIZE 0x80
@@ -1096,7 +1091,7 @@
 				}
 
 				/* Free the original skb. */
-				dev_free_skb(tp->tx_info[entry].skb);
+				dev_kfree_skb_irq(tp->tx_info[entry].skb);
 				tp->tx_info[entry].skb = NULL;
 				if (tp->tx_full) {
 					/* The ring is no longer full, wake the queue. */
@@ -1322,7 +1317,7 @@
 		if (skb) {
 			if (mapping)
 				pci_unmap_single(tp->pdev, mapping, skb->len);
-			dev_free_skb(skb);
+			dev_kfree_skb(skb);
 		}
 		tp->tx_info[i].skb = NULL;
 		tp->tx_info[i].mapping = 0;

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