diff mbox series

net: mvneta: Fix the case where the last poll did not process all rx

Message ID 20200316225636.78b08da4@xhacker
State Accepted
Delegated to: David Miller
Headers show
Series net: mvneta: Fix the case where the last poll did not process all rx | expand

Commit Message

Jisheng Zhang March 16, 2020, 2:56 p.m. UTC 
From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

For the case where the last mvneta_poll did not process all
RX packets, we need to xor the pp->cause_rx_tx or port->cause_rx_tx
before claculating the rx_queue.

Fixes: 2dcf75e2793c ("net: mvneta: Associate RX queues with each CPU")
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
---
 drivers/net/ethernet/marvell/mvneta.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

David Miller March 16, 2020, 10:07 p.m. UTC | #1 
From: Jisheng Zhang <jszhang3@mail.ustc.edu.cn>
Date: Mon, 16 Mar 2020 22:56:36 +0800

> From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
> 
> For the case where the last mvneta_poll did not process all
> RX packets, we need to xor the pp->cause_rx_tx or port->cause_rx_tx
> before claculating the rx_queue.
> 
> Fixes: 2dcf75e2793c ("net: mvneta: Associate RX queues with each CPU")
> Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

Applied and queued up for -stable, thanks.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
index 98017e7d5dd0..11babc79dc6c 100644
--- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -3036,11 +3036,10 @@  static int mvneta_poll(struct napi_struct *napi, int budget)
 	/* For the case where the last mvneta_poll did not process all
 	 * RX packets
 	 */
-	rx_queue = fls(((cause_rx_tx >> 8) & 0xff));
-
 	cause_rx_tx |= pp->neta_armada3700 ? pp->cause_rx_tx :
 		port->cause_rx_tx;
 
+	rx_queue = fls(((cause_rx_tx >> 8) & 0xff));
 	if (rx_queue) {
 		rx_queue = rx_queue - 1;
 		if (pp->bm_priv)