Message ID | tencent_E1D1FEF51C599BFD053CC7B4FBFEFC057A0A@qq.com (mailing list archive) |
---|---|
State | New |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net,v2] net: ethernet: sunplus: Switch to ndo_eth_ioctl | expand |
On Thu, Jan 09, 2025 at 02:05:52AM +0000, Yeking@Red54.com wrote: > From: 谢致邦 (XIE Zhibang) <Yeking@Red54.com> > > ndo_do_ioctl is no longer called by the device ioctl handler, > so use ndo_eth_ioctl instead. (found by code inspection) Reviewed-by: Andrew Lunn <andrew@lunn.ch> There are a couple of things which would of been nice to add, but the patch can be accepted anyway. One is a bit more details in the commit message about when ndo_do_ioctl is actually used, just to help make it clearer why the code is wrong and the patch is correct. You could of quoted a76053707dbf: Most users of ndo_do_ioctl are ethernet drivers that implement the MII commands SIOCGMIIPHY/SIOCGMIIREG/SIOCSMIIREG, or hardware timestamping with SIOCSHWTSTAMP/SIOCGHWTSTAMP. Separate these from the few drivers that use ndo_do_ioctl to implement SIOCBOND, SIOCBR and SIOCWANDEV commands. Also, if i find a bug like this, i often wounder if there are more instances of the same bug somewhere else. I did a quick grep and it does seem to be the only case. If you did the same check, it would be nice to mention this in the commit message, maybe below the --- marker so it does not become part of the permanent history in git. Andrew
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, };