mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 10:00:17 +00:00
net: apple: mace: don't call dev_kfree_skb() under spin_lock_irqsave()
[ Upstream commit3dfe3486c1] It is not allowed to call kfree_skb() or consume_skb() from hardware interrupt context or with hardware interrupts being disabled. It should use dev_kfree_skb_irq() or dev_consume_skb_irq() instead. The difference between them is free reason, dev_kfree_skb_irq() means the SKB is dropped in error and dev_consume_skb_irq() means the SKB is consumed in normal. In this case, dev_kfree_skb() is called in mace_tx_timeout() to drop the SKB, when tx timeout, so replace it with dev_kfree_skb_irq(). Fixes:1da177e4c3("Linux-2.6.12-rc2") Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
b38aa74654
commit
2f93b14860
@@ -846,7 +846,7 @@ static void mace_tx_timeout(struct timer_list *t)
|
||||
if (mp->tx_bad_runt) {
|
||||
mp->tx_bad_runt = 0;
|
||||
} else if (i != mp->tx_fill) {
|
||||
dev_kfree_skb(mp->tx_bufs[i]);
|
||||
dev_kfree_skb_irq(mp->tx_bufs[i]);
|
||||
if (++i >= N_TX_RING)
|
||||
i = 0;
|
||||
mp->tx_empty = i;
|
||||
|
||||
Reference in New Issue
Block a user