]> err.no Git - linux-2.6/commitdiff
[PATCH] sky2: dont need to use dev_kfree_skb_any
authorStephen Hemminger <shemminger@osdl.org>
Thu, 23 Mar 2006 16:51:38 +0000 (08:51 -0800)
committerJeff Garzik <jeff@garzik.org>
Thu, 23 Mar 2006 22:13:53 +0000 (17:13 -0500)
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>
drivers/net/sky2.c

index f3f70b07576de654435d87cc32ee3c5382216e18..68f9c206a6205d1e35398ff7cf72d62a4f2558c3 100644 (file)
@@ -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;