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

[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

drivers/net/bnx2.c

+5 −5
Original line number Diff line number Diff line
@@ -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;
@@ -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;



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

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


		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) 
	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;