[PATCH] net: mvneta: use the correct napi pointer
From: andrew@lunn.ch (Andrew Lunn)
Date: 2018-08-09 12:13:17
Also in:
lkml, netdev
On Thu, Aug 09, 2018 at 08:02:42PM +0800, Jisheng Zhang wrote:
if neta_armada3700 is true, the mvneta_pcpu_port's napi is invalid, we should use pp->napi instead. Fix mvneta_config_rss() with this method. Although we can fix mvneta_rx_hwbm() and mvneta_rx_swbm() in the same manner, the napi parm of mvneta_poll() is always correct, so we can pass the correct napi param to mvneta_rx_hwbm() and mvneta_rx_swbm() Signed-off-by: Jisheng Zhang <redacted>
Hi Jisheng
How does this differ from
commit 7a86f05faf112463cfbbdfd222012e247de461a1
Author: Andrew Lunn [off-list ref]
Date: Wed Jul 18 18:10:50 2018 +0200
net: ethernet: mvneta: Fix napi structure mixup on armada 3700
The mvneta Ethernet driver is used on a few different Marvell SoCs.
Some SoCs have per cpu interrupts for Ethernet events. Some SoCs have
a single interrupt, independent of the CPU. The driver handles this by
having a per CPU napi structure when there are per CPU interrupts, and
a global napi structure when there is a single interrupt.
When the napi core calls mvneta_poll(), it passes the napi
instance. This was not being propagated through the call chain, and
instead the per-cpu napi instance was passed to napi_gro_receive()
call. This breaks when there is a single global napi instance.
Signed-off-by: Andrew Lunn [off-list ref]
Fixes: 2636ac3cc2b4 ("net: mvneta: Add network support for Armada 3700 SoC")
Signed-off-by: Gregory CLEMENT [off-list ref]
Signed-off-by: David S. Miller [off-list ref]
which is already in net-next, and i hope net?
Andrew