net: ethernet: sunplus: Switch to ndo_eth_ioctl
author谢致邦 (XIE Zhibang) <Yeking@Red54.com>
Mon, 13 Jan 2025 09:41:56 +0000 (09:41 +0000)
committerJakub Kicinski <kuba@kernel.org>
Wed, 15 Jan 2025 02:09:04 +0000 (18:09 -0800)
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.

Bad commit fd3040b9394c ("net: ethernet: Add driver for Sunplus SP7021")
was the initial driver commit, meaning that PHY IOCTLs where never
available on this driver. Therefore don't consider this as a fix.

Found by code inspection.

Signed-off-by: 谢致邦 (XIE Zhibang) <Yeking@Red54.com>
Link: https://patch.msgid.link/tencent_8CF8A72C708E96B9C7DC1AF96FEE19AF3D05@qq.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/sunplus/spl2sw_driver.c

index 721d8ed3f30205fc607fb2598b1b45e829776be6..5e0e4c9ecbb07140e3954198bc1ef61bbc10b3b7 100644 (file)
@@ -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,
 };