From: Lennert Buytenhek Date: Sun, 24 Aug 2008 00:30:42 +0000 (+0200) Subject: mv643xx_eth: fix inconsistent lock semantics X-Git-Tag: v2.6.27-rc5~8^2~4^2~30^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8e0b1bf6ac6c4c6dd985e586cd765aede4678bba;p=linux-2.6-omap-h63xx.git 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: Lennert Buytenhek --- diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index 8a91d79383d..30e6d4b8d56 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c @@ -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