Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@kernel.org>
To: netdev@vger.kernel.org
Cc: Christoph Hellwig <hch@lst.de>, Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH net-next v2 14/31] net: usb: use ndo_siocdevprivate
Date: Tue, 20 Jul 2021 16:46:21 +0200 [thread overview]
Message-ID: <20210720144638.2859828-15-arnd@kernel.org> (raw)
In-Reply-To: <20210720144638.2859828-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
The pegasus and rtl8150 drivers use SIOCDEVPRIVATE ioctls
to access their MII registers, in place of the normal
commands. This is broken for all compat ioctls today.
Change to ndo_siocdevprivate to fix it.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/usb/pegasus.c | 5 +++--
drivers/net/usb/rtl8150.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 9a907182569c..0475ef0efdca 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -987,7 +987,8 @@ static const struct ethtool_ops ops = {
.set_link_ksettings = pegasus_set_link_ksettings,
};
-static int pegasus_ioctl(struct net_device *net, struct ifreq *rq, int cmd)
+static int pegasus_siocdevprivate(struct net_device *net, struct ifreq *rq,
+ void __user *udata, int cmd)
{
__u16 *data = (__u16 *) &rq->ifr_ifru;
pegasus_t *pegasus = netdev_priv(net);
@@ -1245,7 +1246,7 @@ static int pegasus_resume(struct usb_interface *intf)
static const struct net_device_ops pegasus_netdev_ops = {
.ndo_open = pegasus_open,
.ndo_stop = pegasus_close,
- .ndo_do_ioctl = pegasus_ioctl,
+ .ndo_siocdevprivate = pegasus_siocdevprivate,
.ndo_start_xmit = pegasus_start_xmit,
.ndo_set_rx_mode = pegasus_set_multicast,
.ndo_tx_timeout = pegasus_tx_timeout,
diff --git a/drivers/net/usb/rtl8150.c b/drivers/net/usb/rtl8150.c
index 7656f2a3afd9..4a1b0e0fc3a3 100644
--- a/drivers/net/usb/rtl8150.c
+++ b/drivers/net/usb/rtl8150.c
@@ -822,7 +822,8 @@ static const struct ethtool_ops ops = {
.get_link_ksettings = rtl8150_get_link_ksettings,
};
-static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+static int rtl8150_siocdevprivate(struct net_device *netdev, struct ifreq *rq,
+ void __user *udata, int cmd)
{
rtl8150_t *dev = netdev_priv(netdev);
u16 *data = (u16 *) & rq->ifr_ifru;
@@ -850,7 +851,7 @@ static int rtl8150_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
static const struct net_device_ops rtl8150_netdev_ops = {
.ndo_open = rtl8150_open,
.ndo_stop = rtl8150_close,
- .ndo_do_ioctl = rtl8150_ioctl,
+ .ndo_siocdevprivate = rtl8150_siocdevprivate,
.ndo_start_xmit = rtl8150_start_xmit,
.ndo_tx_timeout = rtl8150_tx_timeout,
.ndo_set_rx_mode = rtl8150_set_multicast,
--
2.29.2
next prev parent reply other threads:[~2021-07-20 15:16 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-20 14:46 [PATCH net-next v2 00/31] ndo_ioctl rework Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 01/31] net: split out SIOCDEVPRIVATE handling from dev_ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 02/31] staging: rtlwifi: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 03/31] staging: wlan-ng: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 04/31] hostap: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 05/31] bridge: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 06/31] phonet: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 07/31] tulip: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 08/31] bonding: use siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 09/31] appletalk: use ndo_siocdevprivate Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 10/31] hamachi: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 11/31] tehuti: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 12/31] eql: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 13/31] fddi: " Arnd Bergmann
2021-07-20 14:46 ` Arnd Bergmann [this message]
2021-07-20 14:46 ` [PATCH net-next v2 15/31] slip/plip: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 16/31] qeth: " Arnd Bergmann
2021-07-21 6:05 ` Julian Wiedmann
2021-07-21 8:49 ` Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 17/31] cxgb3: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 18/31] hamradio: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 19/31] airo: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 20/31] ip_tunnel: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 21/31] hippi: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 22/31] sb1000: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 23/31] ppp: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 24/31] wan: " Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 25/31] wan: cosa: remove dead cosa_net_ioctl() function Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 26/31] dev_ioctl: pass SIOCDEVPRIVATE data separately Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 27/31] dev_ioctl: split out ndo_eth_ioctl Arnd Bergmann
2021-07-21 16:21 ` Shannon Nelson
2021-07-20 14:46 ` [PATCH net-next v2 28/31] net: split out ndo_siowandev ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 29/31] net: socket: return changed ifreq from SIOCDEVPRIVATE Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 30/31] net: bridge: move bridge ioctls out of .ndo_do_ioctl Arnd Bergmann
2021-07-20 14:46 ` [PATCH net-next v2 31/31] net: bonding: move ioctl handling to private ndo operation Arnd Bergmann
2021-07-20 19:08 ` [PATCH net-next v2 00/31] ndo_ioctl rework David Miller
2021-07-22 15:02 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210720144638.2859828-15-arnd@kernel.org \
--to=arnd@kernel.org \
--cc=arnd@arndb.de \
--cc=hch@lst.de \
--cc=netdev@vger.kernel.org \
--subject='Re: [PATCH net-next v2 14/31] net: usb: use ndo_siocdevprivate' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).