diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 14:17:41 -0700 |
|---|---|---|
| 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 | bonding: Call dev_kfree_skby_any instead of kfree_skb. (diff) | |
| download | linux-dev-f458b2ee93ee3606c83f76213fbe49e026bac754.tar.xz linux-dev-f458b2ee93ee3606c83f76213fbe49e026bac754.zip | |
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 '')
| -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) sw_cons = BNX2_NEXT_TX_BD(sw_cons); tx_bytes += skb->len; - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); tx_pkt++; if (tx_pkt == budget) break; @@ -6604,7 +6604,7 @@ bnx2_start_xmit(struct sk_buff *skb, struct net_device *dev) mapping = dma_map_single(&bp->pdev->dev, skb->data, len, PCI_DMA_TODEVICE); if (dma_mapping_error(&bp->pdev->dev, mapping)) { - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } @@ -6697,7 +6697,7 @@ dma_error: PCI_DMA_TODEVICE); } - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } |