summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2014-03-15 17:16:22 -0700
committerEric W. Biederman <ebiederm@xmission.com>2014-03-24 21:19:02 -0700
commit361457415ae2028a27ee679f60be512efe40e083 (patch)
treed6a932e2bf1a0a0376423eb6cd454eb62ba6d326
parent8e7e687452fcabb036c9d3ce1f6df20a9436c9b2 (diff)
downloadlinux-361457415ae2028a27ee679f60be512efe40e083.tar.gz
linux-361457415ae2028a27ee679f60be512efe40e083.tar.bz2
linux-361457415ae2028a27ee679f60be512efe40e083.zip
ucc_geth: Call dev_consume_skb_any instead of dev_kfree_skb.
Replace dev_kfree_skb with dev_consume_skb_any in ucc_geth_tx that can be called in hard irq and other contexts, when processing the tx completion event. Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
-rw-r--r--drivers/net/ethernet/freescale/ucc_geth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/ucc_geth.c b/drivers/net/ethernet/freescale/ucc_geth.c
index 72291a8904a9..c8299c31b21f 100644
--- a/drivers/net/ethernet/freescale/ucc_geth.c
+++ b/drivers/net/ethernet/freescale/ucc_geth.c
@@ -3261,7 +3261,7 @@ static int ucc_geth_tx(struct net_device *dev, u8 txQ)
dev->stats.tx_packets++;
- dev_kfree_skb(skb);
+ dev_consume_skb_any(skb);
ugeth->tx_skbuff[txQ][ugeth->skb_dirtytx[txQ]] = NULL;
ugeth->skb_dirtytx[txQ] =