diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 17:17:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-12 16:22:13 -0400 |
commit | f458b2ee93ee3606c83f76213fbe49e026bac754 (patch) | |
tree | 6c7b905bb54c93b28445ade2b2336ea7bc7d5bc2 /drivers/net/ethernet/broadcom/bnx2.c | |
parent | 2bb77ab42a6a40162a367b80394b96bb756ad5f1 (diff) |
bnx2: Call dev_kfree_skby_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in functions that can
be called in hard irq and other contexts.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2.c')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c index ca6b36220d94..c251ca3056de 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c | |||
@@ -2885,7 +2885,7 @@ bnx2_tx_int(struct bnx2 *bp, struct bnx2_napi *bnapi, int budget) | |||
2885 | sw_cons = BNX2_NEXT_TX_BD(sw_cons); | 2885 | sw_cons = BNX2_NEXT_TX_BD(sw_cons); |
2886 | 2886 | ||
2887 | tx_bytes += skb->len; | 2887 | tx_bytes += skb->len; |
2888 | dev_kfree_skb(skb); | 2888 | dev_kfree_skb_any(skb); |
2889 | tx_pkt++; | 2889 | tx_pkt++; |
2890 | if (tx_pkt == budget) | 2890 | if (tx_pkt == budget) |
2891 | break; | 2891 | break; |
@@ -6604,7 +6604,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
6604 | 6604 | ||
6605 | mapping = dma_map_single(&bp->pdev->dev, skb->data, len, PCI_DMA_TODEVICE); | 6605 | mapping = dma_map_single(&bp->pdev->dev, skb->data, len, PCI_DMA_TODEVICE); |
6606 | if (dma_mapping_error(&bp->pdev->dev, mapping)) { | 6606 | if (dma_mapping_error(&bp->pdev->dev, mapping)) { |
6607 | dev_kfree_skb(skb); | 6607 | dev_kfree_skb_any(skb); |
6608 | return NETDEV_TX_OK; | 6608 | return NETDEV_TX_OK; |
6609 | } | 6609 | } |
6610 | 6610 | ||
@@ -6697,7 +6697,7 @@ dma_error: | |||
6697 | PCI_DMA_TODEVICE); | 6697 | PCI_DMA_TODEVICE); |
6698 | } | 6698 | } |
6699 | 6699 | ||
6700 | dev_kfree_skb(skb); | 6700 | dev_kfree_skb_any(skb); |
6701 | return NETDEV_TX_OK; | 6701 | return NETDEV_TX_OK; |
6702 | } | 6702 | } |
6703 | 6703 | ||