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

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

net: amd: lance: don't call dev_kfree_skb() under spin_lock_irqsave() 



[ Upstream commit 6151d105dfce8c23edf30eed35e97f3d9b96a35c ]

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 these two cases, dev_kfree_skb() is called consume the xmited SKB,
so replace it with dev_consume_skb_irq().

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

drivers/net/ethernet/amd/atarilance.c

+1 −1
Original line number Diff line number Diff line
@@ -826,7 +826,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	lp->memcpy_f( PKTBUF_ADDR(head), (void *)skb->data, skb->len );

	head->flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP;

	dev->stats.tx_bytes += skb->len;

	dev_kfree_skb( skb );

	dev_consume_skb_irq(skb);

	lp->cur_tx++;

	while( lp->cur_tx >= TX_RING_SIZE && lp->dirty_tx >= TX_RING_SIZE ) {

		lp->cur_tx -= TX_RING_SIZE;

drivers/net/ethernet/amd/lance.c

+1 −1
Original line number Diff line number Diff line
@@ -998,7 +998,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, 
		skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len);

		lp->tx_ring[entry].base =

			((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000;

		dev_kfree_skb(skb);

		dev_consume_skb_irq(skb);

	} else {

		lp->tx_skbuff[entry] = skb;

		lp->tx_ring[entry].base = ((u32)isa_virt_to_bus(skb->data) & 0xffffff) | 0x83000000;