net: usb: introduce usbnet_mii_ioctl helper function
Subsystems (8)
PATCH 1/1 net: usb: introduce usbnet_mii_ioctl helper function
Many USB network drivers use identical code to pass ioctl requests on to the MII layer. Reduce code duplication by refactoring this code into a helper function.
--- drivers/net/usb/asix_devices.c | 11 ++--------- drivers/net/usb/ax88179_178a.c | 8 +------- drivers/net/usb/dm9601.c | 9 +-------- drivers/net/usb/mcs7830.c | 8 +------- drivers/net/usb/smsc75xx.c | 4 +--- drivers/net/usb/sr9700.c | 9 +-------- drivers/net/usb/sr9800.c | 9 +-------- drivers/net/usb/usbnet.c | 8 ++++++++ include/linux/usb/usbnet.h | 1 + 9 files changed, 17 insertions(+), 50 deletions(-)
drivers/net/usb/asix_devices.c +2 -9
@@ -104,13 +104,6 @@ static u32 asix_get_link(struct net_device *net)return mii_link_ok (&dev->mii); } -static int asix_ioctl (struct net_device *net,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (net); - -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -/* We need to override some ethtool_ops so we require our own structure so we don't interfere with other usbnet devices that may be connected at the same time. */
@@ -197,7 +190,7 @@ static const struct net_device_ops ax88172_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = asix_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = ax88172_set_multicast, };
@@ -1276,7 +1269,7 @@ static const struct net_device_ops ax88178_netdev_ops = { .ndo_set_mac_address = asix_set_mac_address, .ndo_validate_addr = eth_validate_addr, .ndo_set_rx_mode = asix_set_multicast, - .ndo_eth_ioctl = asix_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_change_mtu = ax88178_change_mtu, };
drivers/net/usb/ax88179_178a.c +1 -7
@@ -847,12 +847,6 @@ static int ax88179_set_eee(struct net_device *net, struct ethtool_keee *edata)return ret; } -static int ax88179_ioctl (struct net_device *net,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (net); -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -static const struct ethtool_ops ax88179_ethtool_ops = { .get_link = ethtool_op_get_link, .get_msglevel = usbnet_get_msglevel,
@@ -998,7 +992,7 @@ static const struct net_device_ops ax88179_netdev_ops = { .ndo_change_mtu = ax88179_change_mtu, .ndo_set_mac_address = ax88179_set_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = ax88179_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = ax88179_set_multicast, .ndo_set_features = ax88179_set_features, };
drivers/net/usb/dm9601.c +1 -8
@@ -273,13 +273,6 @@ static u32 dm9601_get_link(struct net_device *net)return mii_link_ok (&dev->mii); } -static int dm9601_ioctl (struct net_device *net,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (net); - -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -static const struct ethtool_ops dm9601_ethtool_ops = { .get_drvinfo = dm9601_get_drvinfo, .get_link = dm9601_get_link,
@@ -351,7 +344,7 @@ static const struct net_device_ops dm9601_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = dm9601_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = dm9601_set_multicast, .ndo_set_mac_address = dm9601_set_mac_address, };
drivers/net/usb/mcs7830.c +1 -7
@@ -325,12 +325,6 @@ static void mcs7830_mdio_write(struct net_device *netdev, int phy_id,mcs7830_write_phy (dev, location, val); } -static int mcs7830_ioctl (struct net_device *net,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (net); -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -static inline struct mcs7830_data *mcs7830_get_data (struct usbnet *dev) {return (struct mcs7830_data *)&dev->data;
@@ -473,7 +467,7 @@ static const struct net_device_ops mcs7830_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = mcs7830_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = mcs7830_set_multicast, .ndo_set_mac_address = mcs7830_set_mac_address, };
drivers/net/usb/smsc75xx.c +1 -3
@@ -744,12 +744,10 @@ static const struct ethtool_ops smsc75xx_ethtool_ops = {static int smsc75xx_ioctl (struct net_device *netdev,struct ifreq *rq,int cmd) { -struct usbnet *dev =netdev_priv (netdev); -if (!netif_running (netdev))return -EINVAL ; -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); +return usbnet_mii_ioctl (netdev, rq, cmd); }static void smsc75xx_init_mac_address (struct usbnet *dev)
drivers/net/usb/sr9700.c +1 -8
@@ -243,13 +243,6 @@ static u32 sr9700_get_link(struct net_device *netdev)return rc; } -static int sr9700_ioctl (struct net_device *netdev,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (netdev); - -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -static const struct ethtool_ops sr9700_ethtool_ops = { .get_drvinfo = usbnet_get_drvinfo, .get_link = sr9700_get_link,
@@ -318,7 +311,7 @@ static const struct net_device_ops sr9700_netdev_ops = { .ndo_change_mtu = usbnet_change_mtu, .ndo_get_stats64 = dev_get_tstats64, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = sr9700_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = sr9700_set_multicast, .ndo_set_mac_address = sr9700_set_mac_address, };
drivers/net/usb/sr9800.c +1 -8
@@ -485,13 +485,6 @@ static u32 sr_get_link(struct net_device *net)return mii_link_ok (&dev->mii); } -static int sr_ioctl (struct net_device *net,struct ifreq *rq,int cmd) -{ -struct usbnet *dev =netdev_priv (net); - -return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); -} -static int sr_set_mac_address (struct net_device *net,void *p) {struct usbnet *dev =netdev_priv (net);
@@ -684,7 +677,7 @@ static const struct net_device_ops sr9800_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = sr_set_mac_address, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = sr_ioctl, + .ndo_eth_ioctl = usbnet_mii_ioctl, .ndo_set_rx_mode = sr_set_multicast, };
drivers/net/usb/usbnet.c +8 -0
@@ -1085,6 +1085,14 @@ int usbnet_nway_reset(struct net_device *net) }EXPORT_SYMBOL_GPL (usbnet_nway_reset); +int usbnet_mii_ioctl (struct net_device *net,struct ifreq *rq,int cmd) +{ +struct usbnet *dev =netdev_priv (net); + +return generic_mii_ioctl (&dev->mii,if_mii (rq), cmd,NULL ); +} +EXPORT_SYMBOL_GPL (usbnet_mii_ioctl); +void usbnet_get_drvinfo (struct net_device *net,struct ethtool_drvinfo *info) {struct usbnet *dev =netdev_priv (net);
include/linux/usb/usbnet.h +1 -0
@@ -290,6 +290,7 @@ extern u32 usbnet_get_msglevel(struct net_device *);extern void usbnet_set_msglevel (struct net_device *,u32 );extern void usbnet_set_rx_mode (struct net_device *net);extern void usbnet_get_drvinfo (struct net_device *,struct ethtool_drvinfo *); +extern int usbnet_mii_ioctl (struct net_device *net,struct ifreq *rq,int cmd);extern int usbnet_nway_reset (struct net_device *net);extern int usbnet_manage_power (struct usbnet *,int );
Signature · 1 line
2.43.0
PATCH 1/1 net: usb: smsc95xx: use phy_do_ioctl_running function
The smsc95xx_ioctl function behaves identically to the phy_do_ioctl_running function. Remove it and use the phy_do_ioctl_running function directly instead.
--- drivers/net/usb/smsc95xx.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
drivers/net/usb/smsc95xx.c +1 -9
@@ -854,14 +854,6 @@ static const struct ethtool_ops smsc95xx_ethtool_ops = { .set_pauseparam = smsc95xx_set_pauseparam, }; -static int smsc95xx_ioctl (struct net_device *netdev,struct ifreq *rq,int cmd) -{ -if (!netif_running (netdev)) -return -EINVAL ; - -return phy_mii_ioctl (netdev->phydev, rq, cmd); -} -static void smsc95xx_init_mac_address (struct usbnet *dev) {u8 addr[ETH_ALEN ];
@@ -1139,7 +1131,7 @@ static const struct net_device_ops smsc95xx_netdev_ops = { .ndo_get_stats64 = dev_get_tstats64, .ndo_set_mac_address = eth_mac_addr, .ndo_validate_addr = eth_validate_addr, - .ndo_eth_ioctl = smsc95xx_ioctl, + .ndo_eth_ioctl = phy_do_ioctl_running, .ndo_set_rx_mode = smsc95xx_set_multicast, .ndo_set_features = smsc95xx_set_features, };
Signature · 1 line
2.43.0
Quoted 5 lines · Ethan Nelson-Moore
Many USB network drivers use identical code to pass ioctl requests on to the MII layer. Reduce code duplication by refactoring this code into a helper function.
Signed-off-by Ethan Nelson-Moore <[email protected]>
For new patches it is useful to run scripts/get_maintainer.pl on the patch file to figure out maintainers to put into CC for the review.
Re: [PATCH net-next] net: usb: smsc95xx: use phy_do_ioctl_running function
In reply to Ethan Nelson-MooreQuoted 5 lines · Ethan Nelson-Moore
The
smsc95xx_ioctlfunction behaves identically to thephy_do_ioctl_runningfunction. Remove it and use thephy_do_ioctl_runningfunction directly instead.Signed-off-by Ethan Nelson-Moore <[email protected]>
Andrew
Jakub Kicinski
maintainerQuoted 3 lines · On Tue, 6 Jan 2026 22:57:48 -0800 Ethan Nelson-Moore wrote:
Many USB network drivers use identical code to pass ioctl requests on to the MII layer. Reduce code duplication by refactoring this code into a helper function.
Please remember to add the Reviewed-by tags you already received to the patches when reposting. We're expecting all the patches you submitted yesterday to be reposted with the appropriate folks on the CC.