system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-21 19:47:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

gianfar: Continue polling until both tx and rx are empty

Browse source 
gfar_poll would declare polling done once the rx queue was empty,
but the tx queue could still have packets left.

Stolen mostly from the e1000 driver.

Signed-off-by: Andy Fleming <afleming@freescale.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Fleming 2008-12-17 16:52:30 -08:00 committed by David S. Miller
parent 8c7396aebb
commit 4219988459
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/gianfar.c
View file

@ -1843,7 +1843,8 @@ static int gfar_poll(struct napi_struct *napi, int budget)
{
struct gfar_private *priv = container_of(napi, struct gfar_private, napi);
struct net_device *dev = priv->dev;
int howmany;
int tx_cleaned = 0;
int rx_cleaned = 0;
unsigned long flags;
/* Clear IEVENT, so interrupts aren't called again
@ -1852,13 +1853,16 @@ static int gfar_poll(struct napi_struct *napi, int budget)
/* If we fail to get the lock, don't bother with the TX BDs */
if (spin_trylock_irqsave(&priv->txlock, flags)) {
gfar_clean_tx_ring(dev);
tx_cleaned = gfar_clean_tx_ring(dev);
spin_unlock_irqrestore(&priv->txlock, flags);
}
howmany = gfar_clean_rx_ring(dev, budget);
rx_cleaned = gfar_clean_rx_ring(dev, budget);
if (howmany < budget) {
if (tx_cleaned)
return budget;
if (rx_cleaned < budget) {
netif_rx_complete(dev, napi);
/* Clear the halt bit in RSTAT */
@ -1878,7 +1882,7 @@ static int gfar_poll(struct napi_struct *napi, int budget)
}
}
return howmany;
return rx_cleaned;
}
#ifdef CONFIG_NET_POLL_CONTROLLER