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 04/31] hostap: use ndo_siocdevprivate
Date: Tue, 20 Jul 2021 16:46:11 +0200 [thread overview]
Message-ID: <20210720144638.2859828-5-arnd@kernel.org> (raw)
In-Reply-To: <20210720144638.2859828-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb.de>
hostap has a combination of iwpriv ioctls that do not work at
all, and two SIOCDEVPRIVATE commands that work natively but
lack a compat conversion handler.
For the moment, move them over to the new ndo_siocdevprivate
interface and return an error for compat mode.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/intersil/hostap/hostap.h | 3 +-
.../wireless/intersil/hostap/hostap_ioctl.c | 30 +++++++++++++++----
.../wireless/intersil/hostap/hostap_main.c | 3 ++
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/intersil/hostap/hostap.h b/drivers/net/wireless/intersil/hostap/hostap.h
index c4b81ff7d7e4..c17ab6dbbb53 100644
--- a/drivers/net/wireless/intersil/hostap/hostap.h
+++ b/drivers/net/wireless/intersil/hostap/hostap.h
@@ -93,6 +93,7 @@ extern const struct iw_handler_def hostap_iw_handler_def;
extern const struct ethtool_ops prism2_ethtool_ops;
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
-
+int hostap_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
+ void __user *data, int cmd);
#endif /* HOSTAP_H */
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
index 49766b285230..0a376f112db9 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
@@ -3941,7 +3941,8 @@ const struct iw_handler_def hostap_iw_handler_def =
.get_wireless_stats = hostap_get_wireless_stats,
};
-
+/* Private ioctls (iwpriv) that have not yet been converted
+ * into new wireless extensions API */
int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct iwreq *wrq = (struct iwreq *) ifr;
@@ -3953,9 +3954,6 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
local = iface->local;
switch (cmd) {
- /* Private ioctls (iwpriv) that have not yet been converted
- * into new wireless extensions API */
-
case PRISM2_IOCTL_INQUIRE:
if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
else ret = prism2_ioctl_priv_inquire(dev, (int *) wrq->u.name);
@@ -4009,11 +4007,31 @@ int hostap_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
wrq->u.ap_addr.sa_data);
break;
#endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
+ default:
+ ret = -EOPNOTSUPP;
+ break;
+ }
+
+ return ret;
+}
+/* Private ioctls that are not used with iwpriv;
+ * in SIOCDEVPRIVATE range */
+int hostap_siocdevprivate(struct net_device *dev, struct ifreq *ifr,
+ void __user *data, int cmd)
+{
+ struct iwreq *wrq = (struct iwreq *)ifr;
+ struct hostap_interface *iface;
+ local_info_t *local;
+ int ret = 0;
- /* Private ioctls that are not used with iwpriv;
- * in SIOCDEVPRIVATE range */
+ iface = netdev_priv(dev);
+ local = iface->local;
+
+ if (in_compat_syscall()) /* not implemented yet */
+ return -EOPNOTSUPP;
+ switch (cmd) {
#ifdef PRISM2_DOWNLOAD_SUPPORT
case PRISM2_IOCTL_DOWNLOAD:
if (!capable(CAP_NET_ADMIN)) ret = -EPERM;
diff --git a/drivers/net/wireless/intersil/hostap/hostap_main.c b/drivers/net/wireless/intersil/hostap/hostap_main.c
index de97b3304115..54f67b682b6a 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_main.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_main.c
@@ -797,6 +797,7 @@ static const struct net_device_ops hostap_netdev_ops = {
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
+ .ndo_siocdevprivate = hostap_siocdevprivate,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_rx_mode = hostap_set_multicast_list,
.ndo_tx_timeout = prism2_tx_timeout,
@@ -809,6 +810,7 @@ static const struct net_device_ops hostap_mgmt_netdev_ops = {
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
+ .ndo_siocdevprivate = hostap_siocdevprivate,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_rx_mode = hostap_set_multicast_list,
.ndo_tx_timeout = prism2_tx_timeout,
@@ -821,6 +823,7 @@ static const struct net_device_ops hostap_master_ops = {
.ndo_open = prism2_open,
.ndo_stop = prism2_close,
.ndo_do_ioctl = hostap_ioctl,
+ .ndo_siocdevprivate = hostap_siocdevprivate,
.ndo_set_mac_address = prism2_set_mac_address,
.ndo_set_rx_mode = hostap_set_multicast_list,
.ndo_tx_timeout = prism2_tx_timeout,
--
2.29.2
next prev parent reply other threads:[~2021-07-20 15:39 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 ` Arnd Bergmann [this message]
2021-07-20 14:46 ` [PATCH net-next v2 05/31] bridge: use ndo_siocdevprivate 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 ` [PATCH net-next v2 14/31] net: usb: " Arnd Bergmann
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-5-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 04/31] hostap: 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).