netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH][FIX 4.1] bgmac: fix requests for extra polling calls from NAPI
@ 2015-04-23 18:56 Rafał Miłecki
  2015-04-23 19:00 ` Felix Fietkau
  2015-04-23 19:06 ` Eric Dumazet
  0 siblings, 2 replies; 4+ messages in thread
From: Rafał Miłecki @ 2015-04-23 18:56 UTC (permalink / raw)
  To: David S. Miller, netdev
  Cc: Eric Dumazet, Hauke Mehrtens, Rafał Miłecki,
	Felix Fietkau

After d75b1ade567f ("net: less interrupt masking in NAPI") polling
function has to return whole budget when it wants NAPI to call it again.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Cc: Felix Fietkau <nbd@openwrt.org>
Fixes: eb64e2923a886 ("bgmac: leave interrupts disabled as long as there is work to do")
---
 drivers/net/ethernet/broadcom/bgmac.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index de77d3a..21e3c38 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1260,7 +1260,7 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
 
 	/* Poll again if more events arrived in the meantime */
 	if (bgmac_read(bgmac, BGMAC_INT_STATUS) & (BGMAC_IS_TX0 | BGMAC_IS_RX))
-		return handled;
+		return weight;
 
 	if (handled < weight) {
 		napi_complete(napi);
-- 
1.8.4.5

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2015-04-24 15:32 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-23 18:56 [PATCH][FIX 4.1] bgmac: fix requests for extra polling calls from NAPI Rafał Miłecki
2015-04-23 19:00 ` Felix Fietkau
2015-04-24 15:32   ` David Miller
2015-04-23 19:06 ` Eric Dumazet

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).