[PATCH net-next 1/2] eth: mtk: switch to netif_napi_add_tx()

[PATCH net-next 1/2] eth: mtk: switch to netif_napi_add_tx()

[Jakub Kicinski]

netif_napi_add_tx() does not require the weight argument.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: nbd@nbd.name
CC: john@phrozen.org
CC: sean.wang@mediatek.com
CC: Mark-MC.Lee@mediatek.com
CC: matthias.bgg@gmail.com
---
 drivers/net/ethernet/mediatek/mtk_star_emac.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/mediatek/mtk_star_emac.c b/drivers/net/ethernet/mediatek/mtk_star_emac.c
index 21c3668194eb..3f0e5e64de50 100644
--- a/drivers/net/ethernet/mediatek/mtk_star_emac.c
+++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c
@@ -1653,8 +1653,7 @@ static int mtk_star_probe(struct platform_device *pdev)
 
 	netif_napi_add(ndev, &priv->rx_napi, mtk_star_rx_poll,
 		       NAPI_POLL_WEIGHT);
-	netif_tx_napi_add(ndev, &priv->tx_napi, mtk_star_tx_poll,
-			  NAPI_POLL_WEIGHT);
+	netif_napi_add_tx(ndev, &priv->tx_napi, mtk_star_tx_poll);
 
 	return devm_register_netdev(dev, ndev);
 }
-- 
2.36.1

[PATCH net-next 2/2] eth: sp7021: switch to netif_napi_add_tx()

[Jakub Kicinski]

The Tx NAPI should use netif_napi_add_tx().

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: wellslutw@gmail.com
---
 drivers/net/ethernet/sunplus/spl2sw_driver.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/sunplus/spl2sw_driver.c b/drivers/net/ethernet/sunplus/spl2sw_driver.c
index 3773ce5e12cc..546206640492 100644
--- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
+++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
@@ -494,7 +494,7 @@ static int spl2sw_probe(struct platform_device *pdev)
 	/* Add and enable napi. */
 	netif_napi_add(ndev, &comm->rx_napi, spl2sw_rx_poll, NAPI_POLL_WEIGHT);
 	napi_enable(&comm->rx_napi);
-	netif_napi_add(ndev, &comm->tx_napi, spl2sw_tx_poll, NAPI_POLL_WEIGHT);
+	netif_napi_add_tx(ndev, &comm->tx_napi, spl2sw_tx_poll);
 	napi_enable(&comm->tx_napi);
 	return 0;
 
-- 
2.36.1

Re: [PATCH net-next 2/2] eth: sp7021: switch to netif_napi_add_tx()

[呂芳騰]

>
> The Tx NAPI should use netif_napi_add_tx().
>
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: wellslutw@gmail.com
> ---
>  drivers/net/ethernet/sunplus/spl2sw_driver.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/sunplus/spl2sw_driver.c b/drivers/net/ethernet/sunplus/spl2sw_driver.c
> index 3773ce5e12cc..546206640492 100644
> --- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
> +++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
> @@ -494,7 +494,7 @@ static int spl2sw_probe(struct platform_device *pdev)
>         /* Add and enable napi. */
>         netif_napi_add(ndev, &comm->rx_napi, spl2sw_rx_poll, NAPI_POLL_WEIGHT);
>         napi_enable(&comm->rx_napi);
> -       netif_napi_add(ndev, &comm->tx_napi, spl2sw_tx_poll, NAPI_POLL_WEIGHT);
> +       netif_napi_add_tx(ndev, &comm->tx_napi, spl2sw_tx_poll);
>         napi_enable(&comm->tx_napi);
>         return 0;
>
> --
> 2.36.1
>
Thanks for fixing the bug.

I applied the patch and did some tests.
I did not find any problem with patch.

Acked-by: Wells Lu <wellslutw@gmail.com>

Re: [PATCH net-next 1/2] eth: mtk: switch to netif_napi_add_tx()

[patchwork-bot+netdevbpf]

Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Wed,  6 Jul 2022 20:00:19 -0700 you wrote:
> netif_napi_add_tx() does not require the weight argument.
> 
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
> ---
> CC: nbd@nbd.name
> CC: john@phrozen.org
> CC: sean.wang@mediatek.com
> CC: Mark-MC.Lee@mediatek.com
> CC: matthias.bgg@gmail.com
> 
> [...]

Here is the summary with links:
  - [net-next,1/2] eth: mtk: switch to netif_napi_add_tx()
    https://git.kernel.org/netdev/net-next/c/c0f50574223c
  - [net-next,2/2] eth: sp7021: switch to netif_napi_add_tx()
    https://git.kernel.org/netdev/net-next/c/9157533a0a8b

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html