Commit 745720e5 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

[BNX2]: Use dev_kfree_skb() instead of the _irq version

Change all dev_kfree_skb_irq() and dev_kfree_skb_any() to
dev_kfree_skb().  These calls are never used in irq context.
Signed-off-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 656d98b0
...@@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp) ...@@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp)
tx_free_bd += last + 1; tx_free_bd += last + 1;
dev_kfree_skb_irq(skb); dev_kfree_skb(skb);
hw_cons = bp->hw_tx_cons = hw_cons = bp->hw_tx_cons =
sblk->status_tx_quick_consumer_index0; sblk->status_tx_quick_consumer_index0;
...@@ -1824,7 +1824,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget) ...@@ -1824,7 +1824,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
if ((len > (bp->dev->mtu + ETH_HLEN)) && if ((len > (bp->dev->mtu + ETH_HLEN)) &&
(ntohs(skb->protocol) != 0x8100)) { (ntohs(skb->protocol) != 0x8100)) {
dev_kfree_skb_irq(skb); dev_kfree_skb(skb);
goto next_rx; goto next_rx;
} }
...@@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp) ...@@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
skb_shinfo(skb)->frags[j].size, skb_shinfo(skb)->frags[j].size,
PCI_DMA_TODEVICE); PCI_DMA_TODEVICE);
} }
dev_kfree_skb_any(skb); dev_kfree_skb(skb);
i += j + 1; i += j + 1;
} }
...@@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp) ...@@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)
rx_buf->skb = NULL; rx_buf->skb = NULL;
dev_kfree_skb_any(skb); dev_kfree_skb(skb);
} }
} }
...@@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode) ...@@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
udelay(5); udelay(5);
pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE); pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE);
dev_kfree_skb_irq(skb); dev_kfree_skb(skb);
if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) { if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) {
goto loopback_test_done; goto loopback_test_done;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment