diff options
| author |   Jisheng Zhang <Jisheng.Zhang@synaptics.com> | 2020-03-16 22:56:36 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-03-16 15:06:24 -0700 |
| commit | 065fd83e1be2e1ba0d446a257fd86a3cc7bddb51 (patch) | |
| tree | cee687d8844a4156db06403983b264ce0d41acad /drivers/net/ethernet/marvell | |
| parent | net: vxge: fix wrong __VA_ARGS__ usage (diff) | |
| download | wireguard-linux-065fd83e1be2e1ba0d446a257fd86a3cc7bddb51.tar.xz wireguard-linux-065fd83e1be2e1ba0d446a257fd86a3cc7bddb51.zip | |
net: mvneta: Fix the case where the last poll did not process all rx
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/marvell')
| -rw-r--r-- | drivers/net/ethernet/marvell/mvneta.c | 3 |
1 files changed, 1 insertions, 2 deletions
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) |