From: Stephen Hemminger <shemminger@osdl.org>
Date: Thu, 23 Mar 2006 16:51:38 +0000 (-0800)
Subject: [PATCH] sky2: dont need to use dev_kfree_skb_any
X-Git-Tag: v2.6.17-rc1~994^2~8
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15240072ac3ffb67050acd0b71b477c3bb977670;p=linux-2.6

[PATCH] sky2: dont need to use dev_kfree_skb_any

Transmit buffers are always freed with interrupts enabled (softirq),
so we can just call dev_kfree_skb.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index f3f70b0757..68f9c206a6 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -1175,7 +1175,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
 		/* just drop the packet if non-linear expansion fails */
 		if (skb_header_cloned(skb) &&
 		    pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) {
-			dev_kfree_skb_any(skb);
+			dev_kfree_skb(skb);
 			goto out_unlock;
 		}
 
@@ -1324,7 +1324,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done)
 				       PCI_DMA_TODEVICE);
 		}
 
-		dev_kfree_skb_any(skb);
+		dev_kfree_skb(skb);
 	}
 
 	sky2->tx_cons = put;