diff options
| author | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-11 14:17:41 -0700 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-04-27 10:55:07 +0200 |
| commit | 3e8225c1b1be80f776306a9373e2e40237c7ef3a (patch) | |
| tree | 49489df999d07b8943e2627007999c23c818377c | |
| parent | 7bdd0c4713725faa303be905741b71ae919b10e3 (diff) | |
| download | lwn-3e8225c1b1be80f776306a9373e2e40237c7ef3a.tar.gz lwn-3e8225c1b1be80f776306a9373e2e40237c7ef3a.zip | |
bnx2: Call dev_kfree_skby_any instead of dev_kfree_skb.
commit f458b2ee93ee3606c83f76213fbe49e026bac754 upstream.
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 8f9e76d2dd8b..f00d058d8a90 100644 --- a/drivers/net/ethernet/broadcom/bnx2.c +++ b/drivers/net/ethernet/broadcom/bnx2.c @@ -2869,7 +2869,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; @@ -6622,7 +6622,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; } @@ -6715,7 +6715,7 @@ dma_error: PCI_DMA_TODEVICE); } - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } |