diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2008-07-08 18:52:53 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-07-11 01:20:30 -0400 |
commit | c21993401479635025a8053aff1f5cfdbfee5fd9 (patch) | |
tree | 498da1d15aecc252276d65888ccc51792e403d73 | |
parent | 9e7bd330702bd8d2a87bf8fee027e90c6c90a401 (diff) |
ixgb: audit use of dev_kfree_skb_any
calls to kfree_skb_any are only required when calling kfree
from interrupt context.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
-rw-r--r-- | drivers/net/ixgb/ixgb_main.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c index 05b2677d6536..3e857c022b66 100644 --- a/drivers/net/ixgb/ixgb_main.c +++ b/drivers/net/ixgb/ixgb_main.c | |||
@@ -903,8 +903,10 @@ ixgb_unmap_and_free_tx_resource(struct ixgb_adapter *adapter, | |||
903 | pci_unmap_page(pdev, buffer_info->dma, buffer_info->length, | 903 | pci_unmap_page(pdev, buffer_info->dma, buffer_info->length, |
904 | PCI_DMA_TODEVICE); | 904 | PCI_DMA_TODEVICE); |
905 | 905 | ||
906 | /* okay to call kfree_skb here instead of kfree_skb_any because | ||
907 | * this is never called in interrupt context */ | ||
906 | if (buffer_info->skb) | 908 | if (buffer_info->skb) |
907 | dev_kfree_skb_any(buffer_info->skb); | 909 | dev_kfree_skb(buffer_info->skb); |
908 | 910 | ||
909 | buffer_info->skb = NULL; | 911 | buffer_info->skb = NULL; |
910 | buffer_info->dma = 0; | 912 | buffer_info->dma = 0; |
@@ -1447,7 +1449,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
1447 | } | 1449 | } |
1448 | 1450 | ||
1449 | if (skb->len <= 0) { | 1451 | if (skb->len <= 0) { |
1450 | dev_kfree_skb_any(skb); | 1452 | dev_kfree_skb(skb); |
1451 | return 0; | 1453 | return 0; |
1452 | } | 1454 | } |
1453 | 1455 | ||
@@ -1464,7 +1466,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev) | |||
1464 | 1466 | ||
1465 | tso = ixgb_tso(adapter, skb); | 1467 | tso = ixgb_tso(adapter, skb); |
1466 | if (tso < 0) { | 1468 | if (tso < 0) { |
1467 | dev_kfree_skb_any(skb); | 1469 | dev_kfree_skb(skb); |
1468 | return NETDEV_TX_OK; | 1470 | return NETDEV_TX_OK; |
1469 | } | 1471 | } |
1470 | 1472 | ||