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

Commit 8e0b1bf6 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Lennert Buytenhek
Browse files

mv643xx_eth: fix inconsistent lock semantics 



Nicolas Pitre noted that mv643xx_eth_poll was incorrectly using
non-IRQ-safe locks while checking whether to wake up the netdevice's
transmit queue.  Convert the locking to *_irq() variants, since we
are running from softirq context where interrupts are enabled.

Signed-off-by: default avatarLennert Buytenhek <buytenh@marvell.com>
parent 92c70f27

drivers/net/mv643xx_eth.c

+2 −2
Original line number Diff line number Diff line
@@ -634,9 +634,9 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget) 
				txq_reclaim(mp->txq + i, 0);



		if (netif_carrier_ok(mp->dev)) {

			spin_lock(&mp->lock);

			spin_lock_irq(&mp->lock);

			__txq_maybe_wake(mp->txq + mp->txq_primary);

			spin_unlock(&mp->lock);

			spin_unlock_irq(&mp->lock);

		}

	}

#endif