diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2014-03-15 17:40:17 -0700 |
|---|---|---|
| committer | Eric W. Biederman <ebiederm@xmission.com> | 2014-03-24 21:19:06 -0700 |
| commit | 2d4186cef9fa5f9aed528723ff8d13c00ae8356d (patch) | |
| tree | eeaaadb61224c8ae3b93425ad70f8dc22fea08e6 /drivers/net/ethernet/marvell/sky2.c | |
| parent | skge: Call dev_kfree/consume_skb_any instead of dev_kfree_skb. (diff) | |
| download | linux-dev-2d4186cef9fa5f9aed528723ff8d13c00ae8356d.tar.xz linux-dev-2d4186cef9fa5f9aed528723ff8d13c00ae8356d.zip | |
sky2: Call dev_kfree_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_kfree_skb_any in sky2_xmit_frame that
can be called in hard irq and other contexts.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Diffstat (limited to 'drivers/net/ethernet/marvell/sky2.c')
| -rw-r--r-- | drivers/net/ethernet/marvell/sky2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index d524676fdff4..b81106451a0a 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -2002,7 +2002,7 @@ mapping_unwind: mapping_error: if (net_ratelimit()) dev_warn(&hw->pdev->dev, "%s: tx mapping error\n", dev->name); - dev_kfree_skb(skb); + dev_kfree_skb_any(skb); return NETDEV_TX_OK; } |