Skip to content

Commit

Permalink
ixgb: audit use of dev_kfree_skb_any
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jesse Brandeburg authored and Jeff Garzik committed Jul 11, 2008
1 parent 9e7bd33 commit c219934
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/ixgb/ixgb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}

Expand All @@ -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;
}

Expand Down

0 comments on commit c219934

Please sign in to comment.