summaryrefslogtreecommitdiffstats
path: root/drivers/net/mv643xx_eth.c
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-07-15 13:34:51 +0200
committerLennert Buytenhek <buytenh@marvell.com>2008-07-24 06:22:51 +0200
commit4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3 (patch)
treedd5614ebe258b8269d191a2d3a8458fe6d10734e /drivers/net/mv643xx_eth.c
parent6b368f6859c80343e5d7c6e2a7c49df0a8a273c1 (diff)
downloadlinux-4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3.tar.gz
linux-4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3.tar.bz2
linux-4dfc1c87af46f9d8abf2ef78a4e22891d7a564c3.zip
mv643xx_eth: fix transmit-reclaim-in-napi-poll
The mv643xx_eth driver allows doing transmit reclaim from within the napi poll routine, but after doing reclaim, it would forget to check the free transmit descriptor count and wake up the transmit queue if the reclaim caused enough descriptors for a new packet to become available. This would cause the netdev watchdog to occasionally kick in during certain workloads with combined receive and transmit traffic. Fix this by adding a wakeup check identical to the one in the interrupt handler to the napi poll routine. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'drivers/net/mv643xx_eth.c')
-rw-r--r--drivers/net/mv643xx_eth.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index d7620c50efb1..3211369a4320 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -626,6 +626,12 @@ static int mv643xx_eth_poll(struct napi_struct *napi, int budget)
for (i = 0; i < 8; i++)
if (mp->txq_mask & (1 << i))
txq_reclaim(mp->txq + i, 0);
+
+ if (netif_carrier_ok(mp->dev)) {
+ spin_lock(&mp->lock);
+ __txq_maybe_wake(mp->txq + mp->txq_primary);
+ spin_unlock(&mp->lock);
+ }
}
#endif