3.2.82-rc1 review patch. If anyone has any objections, please let me know.
------------------ From: Wolfgang Grandegger <[email protected]> commit 43200a4480cbbe660309621817f54cbb93907108 upstream. At high bus load it could happen that "at91_poll()" enters with all RX message boxes filled up. If then at the end the "quota" is exceeded as well, "rx_next" will not be reset to the first RX mailbox and hence the interrupts remain disabled. Signed-off-by: Wolfgang Grandegger <[email protected]> Tested-by: Amr Bekhit <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> --- drivers/net/can/at91_can.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/net/can/at91_can.c +++ b/drivers/net/can/at91_can.c @@ -727,9 +727,10 @@ static int at91_poll_rx(struct net_devic /* upper group completed, look again in lower */ if (priv->rx_next > get_mb_rx_low_last(priv) && - quota > 0 && mb > get_mb_rx_last(priv)) { + mb > get_mb_rx_last(priv)) { priv->rx_next = get_mb_rx_first(priv); - goto again; + if (quota > 0) + goto again; } return received;
