[PATCH net v4] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[PATCH net v4] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[Yeking]

From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>

The device ioctl handler no longer calls ndo_do_ioctl, but calls
ndo_eth_ioctl to handle mii ioctls. However, sunplus still used
ndo_do_ioctl when it was introduced. So switch to ndo_eth_ioctl. (found
by code inspection)

Fixes: fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")
Fixes: a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl")
Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
---
V3 -> V4: Change Fixes tag back to old style, due to the objection from
Greg Kroah-Hartman.
V2 -> V3: Update commit message again, and add short author date to the
Fixes tag to make it clear at a glance and reduce misunderstandings.
V1 -> V2: Update commit message

 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 721d8ed3f302..5e0e4c9ecbb0 100644
--- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
+++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
@@ -199,7 +199,7 @@ static const struct net_device_ops netdev_ops = {
 	.ndo_start_xmit = spl2sw_ethernet_start_xmit,
 	.ndo_set_rx_mode = spl2sw_ethernet_set_rx_mode,
 	.ndo_set_mac_address = spl2sw_ethernet_set_mac_address,
-	.ndo_do_ioctl = phy_do_ioctl,
+	.ndo_eth_ioctl = phy_do_ioctl,
 	.ndo_tx_timeout = spl2sw_ethernet_tx_timeout,
 };
 
-- 
2.43.0

Re: [PATCH net v4] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[Jakub Kicinski]

On Fri, 10 Jan 2025 13:29:21 +0000 Yeking@Red54.com wrote:
> Fixes: fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")
> Fixes: a76053707dbf ("dev_ioctl: split out ndo_eth_ioctl")

I see your point with the ordering of the commits, please drop 
the second Fixes tag, then :) I'd slightly modify your commit 
message to make this clearer:

The device ioctl handler no longer calls ndo_do_ioctl, but calls
ndo_eth_ioctl to handle mii ioctls. However, even though sunplus
was introduced after commit a76053707dbf ("dev_ioctl: split out 
ndo_eth_ioctl"), it still tried to use ndo_do_ioctl.
Switch to ndo_eth_ioctl. (found by code inspection)

Fixes: fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")
-- 
pw-bot: cr

[PATCH net v5] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[Yeking]

From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>

The device ioctl handler no longer calls ndo_do_ioctl, but calls
ndo_eth_ioctl to handle mii ioctls since commit a76053707dbf
("dev_ioctl: split out ndo_eth_ioctl"). However, sunplus still used
ndo_do_ioctl when it was introduced. So switch to ndo_eth_ioctl. (found
by code inspection)

Fixes: fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")
Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
---
V4 -> V5: Update commit message again
V3 -> V4: Change Fixes tag back to old style, due to the objection from
Greg Kroah-Hartman.
V2 -> V3: Update commit message again, and add short author date to the
Fixes tag to make it clear at a glance and reduce misunderstandings.
V1 -> V2: Update commit message

 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 721d8ed3f302..5e0e4c9ecbb0 100644
--- a/drivers/net/ethernet/sunplus/spl2sw_driver.c
+++ b/drivers/net/ethernet/sunplus/spl2sw_driver.c
@@ -199,7 +199,7 @@ static const struct net_device_ops netdev_ops = {
 	.ndo_start_xmit = spl2sw_ethernet_start_xmit,
 	.ndo_set_rx_mode = spl2sw_ethernet_set_rx_mode,
 	.ndo_set_mac_address = spl2sw_ethernet_set_mac_address,
-	.ndo_do_ioctl = phy_do_ioctl,
+	.ndo_eth_ioctl = phy_do_ioctl,
 	.ndo_tx_timeout = spl2sw_ethernet_tx_timeout,
 };
 
-- 
2.43.0

Re: [PATCH net v5] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[Jakub Kicinski]

On Mon, 13 Jan 2025 09:41:56 +0000 Yeking@Red54.com wrote:
> From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
> 
> The device ioctl handler no longer calls ndo_do_ioctl, but calls
> ndo_eth_ioctl to handle mii ioctls since commit a76053707dbf
> ("dev_ioctl: split out ndo_eth_ioctl"). However, sunplus still used
> ndo_do_ioctl when it was introduced. So switch to ndo_eth_ioctl. (found
> by code inspection)
> 
> Fixes: fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")

It only occurred to me now that if we're fixing the initial commit
the PHY IOCTLs simply weren't available since day 1, so this is more 
of a new feature than a bug fix. We'll apply it for v6.14, sorry for 
the indecisiveness.

Re: [PATCH net v5] net: ethernet: sunplus: Switch to ndo_eth_ioctl

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Mon, 13 Jan 2025 09:41:56 +0000 you wrote:
> From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
> 
> The device ioctl handler no longer calls ndo_do_ioctl, but calls
> ndo_eth_ioctl to handle mii ioctls since commit a76053707dbf
> ("dev_ioctl: split out ndo_eth_ioctl"). However, sunplus still used
> ndo_do_ioctl when it was introduced. So switch to ndo_eth_ioctl. (found
> by code inspection)
> 
> [...]

Here is the summary with links:
  - [net,v5] net: ethernet: sunplus: Switch to ndo_eth_ioctl
    https://git.kernel.org/netdev/net-next/c/5b4c2fdf72f3

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