diff options
author | Michael Chan <mchan@broadcom.com> | 2006-06-29 15:37:41 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-06-29 19:58:21 -0400 |
commit | 745720e58303f940e12944bf7fab52bc9ce48bda (patch) | |
tree | 889ec0c1c5f93a233894a90a8062659e0e7a4835 | |
parent | 656d98b09d57d4e1185c5d2436a42600d48fbcb5 (diff) |
[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: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/bnx2.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index e89d5df3e978..e59cb5925154 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c | |||
@@ -1676,7 +1676,7 @@ bnx2_tx_int(struct bnx2 *bp) | |||
1676 | 1676 | ||
1677 | tx_free_bd += last + 1; | 1677 | tx_free_bd += last + 1; |
1678 | 1678 | ||
1679 | dev_kfree_skb_irq(skb); | 1679 | dev_kfree_skb(skb); |
1680 | 1680 | ||
1681 | hw_cons = bp->hw_tx_cons = | 1681 | hw_cons = bp->hw_tx_cons = |
1682 | sblk->status_tx_quick_consumer_index0; | 1682 | sblk->status_tx_quick_consumer_index0; |
@@ -1824,7 +1824,7 @@ reuse_rx: | |||
1824 | if ((len > (bp->dev->mtu + ETH_HLEN)) && | 1824 | if ((len > (bp->dev->mtu + ETH_HLEN)) && |
1825 | (ntohs(skb->protocol) != 0x8100)) { | 1825 | (ntohs(skb->protocol) != 0x8100)) { |
1826 | 1826 | ||
1827 | dev_kfree_skb_irq(skb); | 1827 | dev_kfree_skb(skb); |
1828 | goto next_rx; | 1828 | goto next_rx; |
1829 | 1829 | ||
1830 | } | 1830 | } |
@@ -3643,7 +3643,7 @@ bnx2_free_tx_skbs(struct bnx2 *bp) | |||
3643 | skb_shinfo(skb)->frags[j].size, | 3643 | skb_shinfo(skb)->frags[j].size, |
3644 | PCI_DMA_TODEVICE); | 3644 | PCI_DMA_TODEVICE); |
3645 | } | 3645 | } |
3646 | dev_kfree_skb_any(skb); | 3646 | dev_kfree_skb(skb); |
3647 | i += j + 1; | 3647 | i += j + 1; |
3648 | } | 3648 | } |
3649 | 3649 | ||
@@ -3669,7 +3669,7 @@ bnx2_free_rx_skbs(struct bnx2 *bp) | |||
3669 | 3669 | ||
3670 | rx_buf->skb = NULL; | 3670 | rx_buf->skb = NULL; |
3671 | 3671 | ||
3672 | dev_kfree_skb_any(skb); | 3672 | dev_kfree_skb(skb); |
3673 | } | 3673 | } |
3674 | } | 3674 | } |
3675 | 3675 | ||
@@ -3999,7 +3999,7 @@ bnx2_run_loopback(struct bnx2 *bp, int loopback_mode) | |||
3999 | udelay(5); | 3999 | udelay(5); |
4000 | 4000 | ||
4001 | pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE); | 4001 | pci_unmap_single(bp->pdev, map, pkt_size, PCI_DMA_TODEVICE); |
4002 | dev_kfree_skb_irq(skb); | 4002 | dev_kfree_skb(skb); |
4003 | 4003 | ||
4004 | if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) { | 4004 | if (bp->status_blk->status_tx_quick_consumer_index0 != bp->tx_prod) { |
4005 | goto loopback_test_done; | 4005 | goto loopback_test_done; |