Message ID | 20221109025432.80900-1-shaozhengchao@huawei.com (mailing list archive) |
---|---|
State | Accepted |
Commit | f111606b63ff2282428ffbac0447c871eb957b6c |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net,v2] net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open() | expand |
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Wed, 9 Nov 2022 10:54:32 +0800 you wrote: > When failed to init rxq or txq in mv643xx_eth_open() for opening device, > napi isn't disabled. When open mv643xx_eth device next time, it will > trigger a BUG_ON() in napi_enable(). Compile tested only. > > Fixes: 2257e05c1705 ("mv643xx_eth: get rid of receive-side locking") > Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> > > [...] Here is the summary with links: - [net,v2] net: mv643xx_eth: disable napi when init rxq or txq failed in mv643xx_eth_open() https://git.kernel.org/netdev/net/c/f111606b63ff You are awesome, thank you!
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 707993b445d1..8941f69d93e9 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c @@ -2481,6 +2481,7 @@ static int mv643xx_eth_open(struct net_device *dev) for (i = 0; i < mp->rxq_count; i++) rxq_deinit(mp->rxq + i); out: + napi_disable(&mp->napi); free_irq(dev->irq, dev); return err;
When failed to init rxq or txq in mv643xx_eth_open() for opening device, napi isn't disabled. When open mv643xx_eth device next time, it will trigger a BUG_ON() in napi_enable(). Compile tested only. Fixes: 2257e05c1705 ("mv643xx_eth: get rid of receive-side locking") Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com> --- v2: modify the description and fixes tag --- drivers/net/ethernet/marvell/mv643xx_eth.c | 1 + 1 file changed, 1 insertion(+)