diff options
author | Stephen Hemminger <shemminger@osdl.org> | 2006-03-23 11:51:38 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-23 17:13:53 -0500 |
commit | 15240072ac3ffb67050acd0b71b477c3bb977670 (patch) | |
tree | 0a8034b3016643698987eada31aeb2ad084ad8b5 /drivers | |
parent | 050ff18016979b98e3cadb930d6e29bfd5530469 (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/sky2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index f3f70b07576d..68f9c206a620 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) | |||
1175 | /* just drop the packet if non-linear expansion fails */ | 1175 | /* just drop the packet if non-linear expansion fails */ |
1176 | if (skb_header_cloned(skb) && | 1176 | if (skb_header_cloned(skb) && |
1177 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { | 1177 | pskb_expand_head(skb, 0, 0, GFP_ATOMIC)) { |
1178 | dev_kfree_skb_any(skb); | 1178 | dev_kfree_skb(skb); |
1179 | goto out_unlock; | 1179 | goto out_unlock; |
1180 | } | 1180 | } |
1181 | 1181 | ||
@@ -1324,7 +1324,7 @@ static void sky2_tx_complete(struct sky2_port *sky2, u16 done) | |||
1324 | PCI_DMA_TODEVICE); | 1324 | PCI_DMA_TODEVICE); |
1325 | } | 1325 | } |
1326 | 1326 | ||
1327 | dev_kfree_skb_any(skb); | 1327 | dev_kfree_skb(skb); |
1328 | } | 1328 | } |
1329 | 1329 | ||
1330 | sky2->tx_cons = put; | 1330 | sky2->tx_cons = put; |