Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15240072 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[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: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 050ff180

drivers/net/sky2.c

+2 −2
Original line number Diff line number Diff line
@@ -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;