diff options
| author | Lennert Buytenhek <buytenh@wantstofly.org> | 2008-08-24 02:30:42 +0200 |
|---|---|---|
| committer | Lennert Buytenhek <buytenh@marvell.com> | 2008-08-24 03:33:16 +0200 |
| commit | 8e0b1bf6ac6c4c6dd985e586cd765aede4678bba (patch) | |
| tree | f54c0f17522fab635509b383220298193ee2a575 /drivers/net/mv643xx_eth.c | |
| parent | 92c70f27d2a78873c940e77c7f075cd8e2e60a2d (diff) | |
| download | kernel-crypto-8e0b1bf6ac6c4c6dd985e586cd765aede4678bba.tar.gz kernel-crypto-8e0b1bf6ac6c4c6dd985e586cd765aede4678bba.tar.xz kernel-crypto-8e0b1bf6ac6c4c6dd985e586cd765aede4678bba.zip | |
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 <buytenh@marvell.com>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
| -rw-r--r-- | drivers/net/mv643xx_eth.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |