patch-2.3.47 linux/drivers/net/tlan.c

• Lines: 51
• Date: Thu Feb 17 15:32:46 2000
• Orig file: v2.3.46/linux/drivers/net/tlan.c
• Orig date: Sat Feb 12 11:22:10 2000

diff -u --recursive --new-file v2.3.46/linux/drivers/net/tlan.c linux/drivers/net/tlan.c
@@ -694,10 +694,7 @@
 
 	if ( ! priv->phyOnline ) {
 		TLAN_DBG( TLAN_DEBUG_TX, "TRANSMIT:  %s PHY is not ready\n", dev->name );
-		if (in_irq())
-			dev_kfree_skb_irq(skb);
-		else
-			dev_kfree_skb(skb);
+		dev_kfree_skb_any(skb);
 		return 0;
 	}
 
@@ -754,12 +751,8 @@
 
 	CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS );
 
-	if ( bbuf ) {
-		if (in_irq())
-			dev_kfree_skb_irq(skb);
-		else
-			dev_kfree_skb(skb);
-	}
+	if ( bbuf )
+		dev_kfree_skb_any(skb);
 		
 	dev->trans_start = jiffies;
 	return 0;
@@ -1626,10 +1619,7 @@
 			list = priv->txList + i;
 			skb = (struct sk_buff *) list->buffer[9].address;
 			if ( skb ) {
-				if (in_irq())
-					dev_kfree_skb_irq( skb );
-				else
-					dev_kfree_skb( skb );
+				dev_kfree_skb_any( skb );
 				list->buffer[9].address = 0;
 			}
 		}
@@ -1638,10 +1628,7 @@
 			list = priv->rxList + i;
 			skb = (struct sk_buff *) list->buffer[9].address;
 			if ( skb ) {
-				if (in_irq())
-					dev_kfree_skb_irq( skb );
-				else
-					dev_kfree_skb( skb );
+				dev_kfree_skb_any( skb );
 				list->buffer[9].address = 0;
 			}
 		}