From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f193.google.com (mail-dy1-f193.google.com [74.125.82.193]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6FD471C6FF5 for ; Tue, 3 Feb 2026 01:35:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.193 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770082524; cv=none; b=XCzZeoGEgmiVaH99tZhsTluUR1OdanLJr289GuwxXdBjH/vrPn9kJeRZ9vhDJ7ZdeL6Si7Ce4SCXtI2EYHs0jcCrE2V8kR+YpSNAa1s1f3aDNewUAFATXiRuTOKZOLIm5kULyiKQDCceFRiVtyifLofSJgE7/TD14QxStpMLcSA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770082524; c=relaxed/simple; bh=ubSZqGD8KRndaDPZhuNufGseCCQS66dakXBWku1wSdY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZpNvjHr85wR+gRxmDs7cd+AmabKqXZQFddUEjykk9+rRNgf98zBuMx1ZuGb24RT6aWu0F4e2xXPzvzpIxUZIv6mVyosod1VkZTe5tArKzUdgx0VaxoJaxki7dDsTGDYYPtDrrraWVy2jkcC3SC3lyVFwWio2ieKkt7W7iOnn8Ac= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=YfrBXVhx; arc=none smtp.client-ip=74.125.82.193 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YfrBXVhx" Received: by mail-dy1-f193.google.com with SMTP id 5a478bee46e88-2b785801c93so1457288eec.0 for ; Mon, 02 Feb 2026 17:35:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770082522; x=1770687322; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=L3o1VZHLx2eNSPx1eYPORrlHqiSo63azfjpKSmRzw8U=; b=YfrBXVhxhSDyFYe6LPikB7cxtehhEqHb13QwD/O1pLO+SoCeO7GYLyoiYDMS5VZ3NA JVej8tte6M/XmYaNSeRQyLYBjJAg2IWWyMJH9wyzEnPmJDrIRHU0EqCoKFjTYlZXhz0p xraRzjS+B25l2jEl4OdCazSQUK+eNuebFfBfgP/EH3yAU22AElPmpKcVOjdeiFs8puth LCEGD5lkFTNtFwwidTgiXNe14klRmAWrSj8puybRD7YQu1AeioLjitV2feyfft+dEXIh iZb9KO0AtNDYZWXiZMxzVgAHHtPB9eILaF40ZlG2gCuXABPZI1lto/N1Nm5cpcUDKJZ6 7eNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770082522; x=1770687322; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=L3o1VZHLx2eNSPx1eYPORrlHqiSo63azfjpKSmRzw8U=; b=ku9xkD8vMeBEyyUHtZL8swBk5V2yyji5iPpacqKkE5PkJpJle1V7VpmH3maxeNdVgn H5uK5cCDPaK9vv9Qr3Lqda+FHi8fRBtXSFoIwZ0E/F8hVCtJMoBMcYIHQQU/IOwS1XM5 6imoh8sAsjBgJ5hR2tLglWvQO3Ge6DyqnvODWhxHSxlvvS9RamrvMlmj9xOJM9bsiPku 6wyPtkkG0JlukRsQgl5MKVBXSX9NnhgHuNuGvJUPodCpp3aqqfKbRZCrax5WMkCMsd6S UpTPHPufAESqbhV14e1nVUQ6RIsVQeA+EUkLiQ2Cp3IS5vKMYHyt4uOdr5Tfb0oytUvE Hexw== X-Gm-Message-State: AOJu0YyRkhTzed37//SX5TbuxXiO1cB9GHCpB2GzlvUIWzujfuVw/PvW rscPTz2Rk0NuZ5MQFI4k81q+Ps1TIqLjyOh/VzQfFmtUVMI/QR548hpA/yAbCPte X-Gm-Gg: AZuq6aJD5FePwgQW/tECyq7jawovMm48N8H3a/pmbk3QZ3Nj2FHhqaL6TtFeXRj8fQ+ z76M9Hl0nXk9ZUwcoe9YDXYl31MbTZ2t79awN2Kh/g0U84lxHKrsSHwAfwathjPzAAI1wr+2UAm v6w4w6QvvoMPurYleKqt9mk3yyaw5UWeV8ivp2Z6N3fhBjlLGEC/Ty2pUTDI8M/mBLGDeKtMLyN HGf0irgrbFET60B4C9niBSJWjRs6QqV6KjJQUspJXt1G9NE7K8E7yR+TSiJhh90Faxd/80VkD1Z dMwOCS8fslre177gbPh61hmld0ASdRpUF+Y/xLHwTCp3L3rrM0kBNQAbptscoZgz8NTPuSmv5Yn kWyuOXT1BObVGllgwEKAUn30uzIaQHDhPfZNiPUs7aLiv0j1FZdcVgDFd3qH6qnIWFq0lDyoLjw SHboQNkzP6u78+21ttcO2AbsdD46rsw1TqjDXj6Eja953i9eLAQdmY0+rug7TWhLbzgNpJACxmw aI5w9uNguZ41J9RqyTeNBzGAc+dl0JaDUbYs5TZj+C2Lz4ZQoZodFXNQYVH7w4810wxHaALpUJD OA7Z X-Received: by 2002:a05:7300:fb83:b0:2b7:143a:9a8f with SMTP id 5a478bee46e88-2b7c863b842mr7317354eec.7.1770082522361; Mon, 02 Feb 2026 17:35:22 -0800 (PST) Received: from ethan-latitude5420.. (host-127-24.cafrjco.fresno.ca.us.clients.pavlovmedia.net. [68.180.127.24]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b7a1abe707sm21613380eec.18.2026.02.02.17.35.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Feb 2026 17:35:22 -0800 (PST) From: Ethan Nelson-Moore To: linux-usb@vger.kernel.org, netdev@vger.kernel.org Cc: Ethan Nelson-Moore , Vadim Fedorenko , Andrew Lunn , Andrew Lunn , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Peter Korsgaard , Steve Glendinning , Oliver Neukum , Greg Kroah-Hartman , Oleksij Rempel , Max Schulze , =?UTF-8?q?Krzysztof=20Ha=C5=82asa?= , Andy Shevchenko Subject: [PATCH net-next v4] net: usb: introduce usbnet_mii_ioctl helper function Date: Mon, 2 Feb 2026 17:34:55 -0800 Message-ID: <20260203013517.26170-1-enelsonmoore@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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. Reviewed-by: Vadim Fedorenko (v1) Reviewed-by: Andrew Lunn (v3) Signed-off-by: Ethan Nelson-Moore --- Changes in v4: Rebase on latest net-next again Changes in v3: Rebase on latest net-next Add changelog Add received Reviewed-by tag Changes in v2 (not numbered): Resent with maintainer CCs 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/sr9800.c | 9 +-------- drivers/net/usb/usbnet.c | 8 ++++++++ include/linux/usb/usbnet.h | 1 + 8 files changed, 16 insertions(+), 42 deletions(-) diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index d8744291d843..7eb6e86adb16 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -97,13 +97,6 @@ static u32 asix_get_phyid(struct usbnet *dev) return phy_id; } -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. */ @@ -190,7 +183,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, }; @@ -1269,7 +1262,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, }; diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index b034ef8a73ea..0e9ae89b840e 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -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, }; diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 9e5649cefcbc..c8e0f8868210 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c @@ -259,13 +259,6 @@ static void dm9601_mdio_write(struct net_device *netdev, int phy_id, int loc, dm_write_shared_word(dev, 1, loc, res); } -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 = usbnet_get_drvinfo, .get_link = usbnet_get_link, @@ -337,7 +330,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, }; diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 3a551ad363d0..d6698f30218d 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c @@ -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; @@ -468,7 +462,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, }; diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index fbc9d796f605..1a61a8bcf5d3 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c @@ -743,12 +743,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) diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c index e3f6233e5866..6fd33a5b2279 100644 --- a/drivers/net/usb/sr9800.c +++ b/drivers/net/usb/sr9800.c @@ -469,13 +469,6 @@ static int sr_get_eeprom(struct net_device *net, return 0; } -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); @@ -668,7 +661,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, }; diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 9280ef544bbb..41b95b04143d 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -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); diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index 2945923a8a95..b0e84896e6ac 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -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); -- 2.43.0