From: Marc Kleine-Budde <mkl@pengutronix.de>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, linux-can@vger.kernel.org,
kernel@pengutronix.de,
"Oliver Stäbler" <oliver.staebler@bytesatwork.ch>,
linux-stable <stable@vger.kernel.org>,
"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH 4/9] can: ti_hecc: Fix napi poll return value for repoll
Date: Fri, 1 Dec 2017 15:17:34 +0100 [thread overview]
Message-ID: <20171201141739.5816-5-mkl@pengutronix.de> (raw)
In-Reply-To: <20171201141739.5816-1-mkl@pengutronix.de>
From: Oliver Stäbler <oliver.staebler@bytesatwork.ch>
After commit d75b1ade567f ("net: less interrupt masking in NAPI") napi
repoll is done only when work_done == budget.
So we need to return budget if there are still packets to receive.
Signed-off-by: Oliver Stäbler <oliver.staebler@bytesatwork.ch>
Cc: linux-stable <stable@vger.kernel.org>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/ti_hecc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/can/ti_hecc.c b/drivers/net/can/ti_hecc.c
index 4d4941469cfc..db6ea936dc3f 100644
--- a/drivers/net/can/ti_hecc.c
+++ b/drivers/net/can/ti_hecc.c
@@ -637,6 +637,9 @@ static int ti_hecc_rx_poll(struct napi_struct *napi, int quota)
mbx_mask = hecc_read(priv, HECC_CANMIM);
mbx_mask |= HECC_TX_MBOX_MASK;
hecc_write(priv, HECC_CANMIM, mbx_mask);
+ } else {
+ /* repoll is done only if whole budget is used */
+ num_pkts = quota;
}
return num_pkts;
--
2.15.0
next prev parent reply other threads:[~2017-12-01 14:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-01 14:17 pull-request: can 2017-12-01 Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 1/9] can: kvaser_usb: free buf in error paths Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 2/9] can: kvaser_usb: Fix comparison bug in kvaser_usb_read_bulk_callback() Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 3/9] can: kvaser_usb: ratelimit errors if incomplete messages are received Marc Kleine-Budde
2017-12-01 14:17 ` Marc Kleine-Budde [this message]
2017-12-01 14:17 ` [PATCH 5/9] can: peak/pci: fix potential bug when probe() fails Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 6/9] can: flexcan: Update IRQ Err Passive information Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 7/9] can: flexcan: fix VF610 state transition issue Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 8/9] can: mcba_usb: fix typo Marc Kleine-Budde
2017-12-01 14:17 ` [PATCH 9/9] can: mcba_usb: fix device disconnect bug Marc Kleine-Budde
2017-12-03 14:58 ` pull-request: can 2017-12-01 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171201141739.5816-5-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=davem@davemloft.net \
--cc=kernel@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=oliver.staebler@bytesatwork.ch \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).