Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf7416aa authored by Yang Yingliang's avatar Yang Yingliang Committed by Greg Kroah-Hartman
Browse files

ethernet: s2io: don't call dev_kfree_skb() under spin_lock_irqsave() 



[ Upstream commit 6cee96e09df54ae17784c0f38a49e0ed8229b825 ]

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 free_tx_buffers() to drop
the SKBs in tx buffers, when the card is down, so replace it with
dev_kfree_skb_irq() here.

Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9ec57818

drivers/net/ethernet/neterion/s2io.c

+1 −1
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ static void free_tx_buffers(struct s2io_nic *nic) 
			skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j);

			if (skb) {

				swstats->mem_freed += skb->truesize;

				dev_kfree_skb(skb);

				dev_kfree_skb_irq(skb);

				cnt++;

			}

		}