Skip to content

Commit

Permalink
[BNX2]: Use dev_kfree_skb() instead of the _irq version
Browse files Browse the repository at this point in the history
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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Michael Chan authored and David S. Miller committed Jun 29, 2006
1 parent 656d98b commit 745720e
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/net/bnx2.c
Original file line number Diff line number Diff line change
Expand Up @@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp)

tx_free_bd += last + 1;

dev_kfree_skb_irq(skb);
dev_kfree_skb(skb);

hw_cons = bp->hw_tx_cons =
sblk->status_tx_quick_consumer_index0;
Expand Down Expand Up @@ -1824,7 +1824,7 @@ bnx2_rx_int(struct bnx2 *bp, int budget)
if ((len > (bp->dev->mtu + ETH_HLEN)) &&
(ntohs(skb->protocol) != 0x8100)) {

dev_kfree_skb_irq(skb);
dev_kfree_skb(skb);
goto next_rx;

}
Expand Down Expand Up @@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp)
skb_shinfo(skb)->frags[j].size,
PCI_DMA_TODEVICE);
}
dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
i += j + 1;
}

Expand All @@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp)

rx_buf->skb = NULL;

dev_kfree_skb_any(skb);
dev_kfree_skb(skb);
}
}

Expand Down Expand Up @@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode)
udelay(5);

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) {
goto loopback_test_done;
Expand Down

0 comments on commit 745720e

Please sign in to comment.