drivers/net: starfire: Fix napi ->poll() weight handling
starfire napi ->poll() handler can return work == weight after calling netif_rx_complete() (if there is no more work). It is illegal and this patch fixes it. Reported-by: Alexander Huemer <alexander.huemer@sbg.ac.at> Tested-by: Alexander Huemer <alexander.huemer@sbg.ac.at> Signed-off-by: Jarek Poplawski <jarkao2@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
bb5f133dbc
commit
9a3de25544
1 changed files with 5 additions and 0 deletions
|
@ -1509,6 +1509,11 @@ static int __netdev_rx(struct net_device *dev, int *quota)
|
||||||
desc->status = 0;
|
desc->status = 0;
|
||||||
np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
|
np->rx_done = (np->rx_done + 1) % DONE_Q_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (*quota == 0) { /* out of rx quota */
|
||||||
|
retcode = 1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
writew(np->rx_done, np->base + CompletionQConsumerIdx);
|
writew(np->rx_done, np->base + CompletionQConsumerIdx);
|
||||||
|
|
||||||
out:
|
out:
|
||||||
|
|
Reference in a new issue