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>

diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index 05b2677d6536a7592bd28e0ba5f40274d2cc4e9f..3e857c022b6626b6d5c07d584fbcfa830ea5f515 100644 (file)
--- 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,
                pci_unmap_page(pdev, buffer_info->dma, buffer_info->length,
                               PCI_DMA_TODEVICE);
 
+       /* okay to call kfree_skb here instead of kfree_skb_any because
+        * this is never called in interrupt context */
        if (buffer_info->skb)
-               dev_kfree_skb_any(buffer_info->skb);
+               dev_kfree_skb(buffer_info->skb);
 
        buffer_info->skb = NULL;
        buffer_info->dma = 0;
@@ -1447,7 +1449,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
        }
 
        if (skb->len <= 0) {
-               dev_kfree_skb_any(skb);
+               dev_kfree_skb(skb);
                return 0;
        }
 
@@ -1464,7 +1466,7 @@ ixgb_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 
        tso = ixgb_tso(adapter, skb);
        if (tso < 0) {
-               dev_kfree_skb_any(skb);
+               dev_kfree_skb(skb);
                return NETDEV_TX_OK;
        }