From: Eric W. Biederman <ebiederm@xmission.com>
Date: Sun, 16 Mar 2014 00:40:17 +0000 (-0700)
Subject: sky2: Call dev_kfree_skb_any instead of dev_kfree_skb.
X-Git-Tag: v3.15-rc1~113^2~96^2~22
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2d4186cef9fa5f9aed528723ff8d13c00ae8356d;p=linux.git

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

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 @@ static netdev_tx_t sky2_xmit_frame(struct sk_buff *skb,
 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;
 }