Re: [PATCH 09/10] wireless: hostap: remove unused ioctl function

2023-10-11 Thread Arnd Bergmann 
On Tue, Oct 10, 2023, at 09:00, Kalle Valo wrote:
> Arnd Bergmann  writes:
>
>> From: Arnd Bergmann 
>>
>> The ioctl handler has no actual callers in the kernel and is useless.
>> All the functionality should be reachable through the regualar interfaces.
>>
>> Signed-off-by: Arnd Bergmann 
>
> In the title we prefer "wifi:" over "wireless:" but that's nitpicking. I
> assume this goes via a net tree so:

Changed for v2

> Acked-by: Kalle Valo 

Thanks

> Let me know if I should take this to wireless-next instead.

I think it's better to keep the series together and merge it
through net-next directly, since the last patch depends on all
the ones before it.

 Arnd

Re: [PATCH 09/10] wireless: hostap: remove unused ioctl function

2023-10-10 Thread Kalle Valo 
Arnd Bergmann  writes:

> From: Arnd Bergmann 
>
> The ioctl handler has no actual callers in the kernel and is useless.
> All the functionality should be reachable through the regualar interfaces.
>
> Signed-off-by: Arnd Bergmann 

In the title we prefer "wifi:" over "wireless:" but that's nitpicking. I
assume this goes via a net tree so:

Acked-by: Kalle Valo 

Let me know if I should take this to wireless-next instead.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

[PATCH 09/10] wireless: hostap: remove unused ioctl function

2023-10-09 Thread Arnd Bergmann 
From: Arnd Bergmann 

The ioctl handler has no actual callers in the kernel and is useless.
All the functionality should be reachable through the regualar interfaces.

Signed-off-by: Arnd Bergmann 
---
 drivers/net/wireless/intersil/hostap/hostap.h |   1 -
 .../wireless/intersil/hostap/hostap_ioctl.c   | 228 --
 .../wireless/intersil/hostap/hostap_main.c|   3 -
 3 files changed, 232 deletions(-)

diff --git a/drivers/net/wireless/intersil/hostap/hostap.h 
b/drivers/net/wireless/intersil/hostap/hostap.h
index c17ab6dbbb538..552ae33d78751 100644
--- a/drivers/net/wireless/intersil/hostap/hostap.h
+++ b/drivers/net/wireless/intersil/hostap/hostap.h
@@ -92,7 +92,6 @@ void hostap_info_process(local_info_t *local, struct sk_buff 
*skb);
 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);
 
diff --git a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c 
b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
index b4adfc190ae87..26162f92e3c3d 100644
--- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c
@@ -2316,21 +2316,6 @@ static const struct iw_priv_args prism2_priv[] = {
 };
 
 
-static int prism2_ioctl_priv_inquire(struct net_device *dev, int *i)
-{
-   struct hostap_interface *iface;
-   local_info_t *local;
-
-   iface = netdev_priv(dev);
-   local = iface->local;
-
-   if (local->func->cmd(dev, HFA384X_CMDCODE_INQUIRE, *i, NULL, NULL))
-   return -EOPNOTSUPP;
-
-   return 0;
-}
-
-
 static int prism2_ioctl_priv_prism2_param(struct net_device *dev,
  struct iw_request_info *info,
  union iwreq_data *uwrq, char *extra)
@@ -2910,146 +2895,6 @@ static int prism2_ioctl_priv_writemif(struct net_device 
*dev,
 }
 
 
-static int prism2_ioctl_priv_monitor(struct net_device *dev, int *i)
-{
-   struct hostap_interface *iface;
-   local_info_t *local;
-   int ret = 0;
-   union iwreq_data wrqu;
-
-   iface = netdev_priv(dev);
-   local = iface->local;
-
-   printk(KERN_DEBUG "%s: process %d (%s) used deprecated iwpriv monitor "
-  "- update software to use iwconfig mode monitor\n",
-  dev->name, task_pid_nr(current), current->comm);
-
-   /* Backward compatibility code - this can be removed at some point */
-
-   if (*i == 0) {
-   /* Disable monitor mode - old mode was not saved, so go to
-* Master mode */
-   wrqu.mode = IW_MODE_MASTER;
-   ret = prism2_ioctl_siwmode(dev, NULL, , NULL);
-   } else if (*i == 1) {
-   /* netlink socket mode is not supported anymore since it did
-* not separate different devices from each other and was not
-* best method for delivering large amount of packets to
-* user space */
-   ret = -EOPNOTSUPP;
-   } else if (*i == 2 || *i == 3) {
-   switch (*i) {
-   case 2:
-   local->monitor_type = PRISM2_MONITOR_80211;
-   break;
-   case 3:
-   local->monitor_type = PRISM2_MONITOR_PRISM;
-   break;
-   }
-   wrqu.mode = IW_MODE_MONITOR;
-   ret = prism2_ioctl_siwmode(dev, NULL, , NULL);
-   hostap_monitor_mode_enable(local);
-   } else
-   ret = -EINVAL;
-
-   return ret;
-}
-
-
-static int prism2_ioctl_priv_reset(struct net_device *dev, int *i)
-{
-   struct hostap_interface *iface;
-   local_info_t *local;
-
-   iface = netdev_priv(dev);
-   local = iface->local;
-
-   printk(KERN_DEBUG "%s: manual reset request(%d)\n", dev->name, *i);
-   switch (*i) {
-   case 0:
-   /* Disable and enable card */
-   local->func->hw_shutdown(dev, 1);
-   local->func->hw_config(dev, 0);
-   break;
-
-   case 1:
-   /* COR sreset */
-   local->func->hw_reset(dev);
-   break;
-
-   case 2:
-   /* Disable and enable port 0 */
-   local->func->reset_port(dev);
-   break;
-
-   case 3:
-   prism2_sta_deauth(local, WLAN_REASON_DEAUTH_LEAVING);
-   if (local->func->cmd(dev, HFA384X_CMDCODE_DISABLE, 0, NULL,
-NULL))
-   return -EINVAL;
-   break;
-
-   case 4:
-   if (local->func->cmd(dev, HFA384X_CMDCODE_ENABLE, 0, NULL,
-NULL))
-   return -EINVAL;
-   break;
-