* [PATCH net-next] eth: octeon: fix build after netif_napi_add() changes
@ 2022-10-02 17:56 Jakub Kicinski
2022-10-04 0:25 ` patchwork-bot+netdevbpf
0 siblings, 1 reply; 3+ messages in thread
From: Jakub Kicinski @ 2022-10-02 17:56 UTC (permalink / raw)
To: davem
Cc: netdev, edumazet, pabeni, Jakub Kicinski, Guenter Roeck,
liuhangbin, mkl
Guenter reports I missed a netif_napi_add() call
in one of the platform-specific drivers:
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c: In function 'octeon_mgmt_probe':
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c:1399:9: error: too many arguments to function 'netif_napi_add'
1399 | netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
| ^~~~~~~~~~~~~~
Reported-by: Guenter Roeck <linux@roeck-us.net>
Fixes: b48b89f9c189 ("net: drop the weight argument from netif_napi_add")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: liuhangbin@gmail.com
CC: mkl@pengutronix.de
---
drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
index 369bfd376d6f..edde0b8fa49c 100644
--- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
+++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
@@ -1396,8 +1396,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, netdev);
p = netdev_priv(netdev);
- netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
- OCTEON_MGMT_NAPI_WEIGHT);
+ netif_napi_add_weight(netdev, &p->napi, octeon_mgmt_napi_poll,
+ OCTEON_MGMT_NAPI_WEIGHT);
p->netdev = netdev;
p->dev = &pdev->dev;
--
2.37.3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] eth: octeon: fix build after netif_napi_add() changes
@ 2022-10-02 22:54 Guenter Roeck
0 siblings, 0 replies; 3+ messages in thread
From: Guenter Roeck @ 2022-10-02 22:54 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, edumazet, pabeni, liuhangbin, mkl
On Sun, Oct 02, 2022 at 10:56:50AM -0700, Jakub Kicinski wrote:
> Guenter reports I missed a netif_napi_add() call
> in one of the platform-specific drivers:
>
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c: In function 'octeon_mgmt_probe':
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c:1399:9: error: too many arguments to function 'netif_napi_add'
> 1399 | netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
> | ^~~~~~~~~~~~~~
>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Fixes: b48b89f9c189 ("net: drop the weight argument from netif_napi_add")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Tested-by: Guenter Roeck <linux@roeck-us.net>
> ---
> CC: liuhangbin@gmail.com
> CC: mkl@pengutronix.de
> ---
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> index 369bfd376d6f..edde0b8fa49c 100644
> --- a/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> +++ b/drivers/net/ethernet/cavium/octeon/octeon_mgmt.c
> @@ -1396,8 +1396,8 @@ static int octeon_mgmt_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, netdev);
> p = netdev_priv(netdev);
> - netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
> - OCTEON_MGMT_NAPI_WEIGHT);
> + netif_napi_add_weight(netdev, &p->napi, octeon_mgmt_napi_poll,
> + OCTEON_MGMT_NAPI_WEIGHT);
>
> p->netdev = netdev;
> p->dev = &pdev->dev;
> --
> 2.37.3
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next] eth: octeon: fix build after netif_napi_add() changes
2022-10-02 17:56 Jakub Kicinski
@ 2022-10-04 0:25 ` patchwork-bot+netdevbpf
0 siblings, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-10-04 0:25 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: davem, netdev, edumazet, pabeni, linux, liuhangbin, mkl
Hello:
This patch was applied to netdev/net-next.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Sun, 2 Oct 2022 10:56:50 -0700 you wrote:
> Guenter reports I missed a netif_napi_add() call
> in one of the platform-specific drivers:
>
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c: In function 'octeon_mgmt_probe':
> drivers/net/ethernet/cavium/octeon/octeon_mgmt.c:1399:9: error: too many arguments to function 'netif_napi_add'
> 1399 | netif_napi_add(netdev, &p->napi, octeon_mgmt_napi_poll,
> | ^~~~~~~~~~~~~~
>
> [...]
Here is the summary with links:
- [net-next] eth: octeon: fix build after netif_napi_add() changes
https://git.kernel.org/netdev/net-next/c/899b8cd0d392
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-04 0:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-02 22:54 [PATCH net-next] eth: octeon: fix build after netif_napi_add() changes Guenter Roeck
-- strict thread matches above, loose matches on Subject: below --
2022-10-02 17:56 Jakub Kicinski
2022-10-04 0:25 ` patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).