wifi: create legacy and virtual directories

To clean up drivers/net/wireless move the virtual drivers to a new virtual directory. I did consider adding CONFIG_WLAN_VENDOR_VIRTUAL like other vendors have but then dropped the idea as we are not real drivers.

There should be no changes in compilation or in Kconfig options, merely moving files. The order in menuconfig is slightly changed, the virtual drivers are now last in the list.

Signed-off-by Kalle Valo <[email protected]>

Hi Kalle,

I love your patch! Perhaps something to improve:

[auto build test WARNING on ec52d77d077529f198fd874c550a26b9cc86a331]

url:
https://github.com/intel-lab-lkp/linux/commits/Kalle-Valo/wifi-move-mac80211_hwsim-and-virt_wifi-to-virtual-directory/20230227-201848

base:   ec52d77d077529f198fd874c550a26b9cc86a331
patch link:    https://lore.kernel.org/r/20230227121732.8967-3-kvalo%40kernel.org
patch subject: [PATCH 2/2] wifi: move raycs, wl3501 and rndis_wlan to legacy directory
config: sparc-allyesconfig

(https://download.01.org/0day-ci/archive/20230228/[email protected]/config)
compiler: sparc64-linux-gcc (GCC) 12.1.0
reproduce (this is a W=1 build):
wget
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
-O ~/bin/make.cross
chmod +x ~/bin/make.cross
#
https://github.com/intel-lab-lkp/linux/commit/b3643ed46f437156c43b21bfc61dd622a6d53191
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review
Kalle-Valo/wifi-move-mac80211_hwsim-and-virt_wifi-to-virtual-directory/20230227-201848

        git checkout b3643ed46f437156c43b21bfc61dd622a6d53191
        # save the config file
        mkdir build_dir && cp config build_dir/.config
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0
make.cross W=1 O=build_dir ARCH=sparc olddefconfig
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0

make.cross W=1 O=build_dir ARCH=sparc SHELL=/bin/bash drivers/net/

If you fix the issue, kindly add following tag where applicable
| Reported-by: kernel test robot <[email protected]>
| Link: https://lore.kernel.org/oe-kbuild-all/[email protected]/

All warnings (new ones prefixed by >>):

In function 'init_startup_params',
inlined from 'ray_init' at drivers/net/wireless/legacy/ray_cs.c:506:2:

Quoted 1 line

Quoted 1 line

drivers/net/wireless/legacy/ray_cs.c:628:17: warning: 'strncpy' specified bound 32 equals destination size [-Wstringop-truncation]

     628 |                 strncpy(local->sparm.b4.a_current_ess_id, essid, ESSID_SIZE);
         |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

To clean up drivers/net/wireless move the old drivers drivers left in the
directory to a new "legacy" directory. I did consider adding CONFIG_WLAN_VENDOR_LEGACY like other vendors have but then dropped the idea as
these are really old drivers and hopefully we get to remove them soon.

There should be no changes in compilation or in Kconfig options, merely moving files.

Signed-off-by Kalle Valo <[email protected]>

---
 drivers/net/wireless/Kconfig                  | 55 +---------------- --
 drivers/net/wireless/Makefile                 |  7 +-- drivers/net/wireless/legacy/Kconfig           | 55
+++++++++++++++++++
 drivers/net/wireless/legacy/Makefile          |  6 ++

 drivers/net/wireless/{ => legacy}/ray_cs.c    |  0
 drivers/net/wireless/{ => legacy}/ray_cs.h    |  0
 drivers/net/wireless/{ => legacy}/rayctl.h    |  0
 .../net/wireless/{ => legacy}/rndis_wlan.c    |  0
 drivers/net/wireless/{ => legacy}/wl3501.h    |  0
 drivers/net/wireless/{ => legacy}/wl3501_cs.c |  0
 10 files changed, 63 insertions(+), 60 deletions(-)

 create mode 100644 drivers/net/wireless/legacy/Kconfig create mode 100644 drivers/net/wireless/legacy/Makefile rename drivers/net/wireless/{ => legacy}/ray_cs.c (100%) rename drivers/net/wireless/{ => legacy}/ray_cs.h (100%) rename drivers/net/wireless/{ => legacy}/rayctl.h (100%) rename drivers/net/wireless/{ => legacy}/rndis_wlan.c (100%) rename drivers/net/wireless/{ => legacy}/wl3501.h (100%) rename drivers/net/wireless/{ => legacy}/wl3501_cs.c (100%)

drivers/net/wireless/Kconfig +0 -0

index 42b40cc96b21..7555af5195ec 100644
@@ -38,60 +38,7 @@ source "drivers/net/wireless/ti/Kconfig"

 source "drivers/net/wireless/zydas/Kconfig"
 source "drivers/net/wireless/quantenna/Kconfig"

-config PCMCIA_RAYCS
-       tristate "Aviator/Raytheon 2.4GHz wireless support" -       depends on PCMCIA
-       select WIRELESS_EXT
-       select WEXT_SPY
-       select WEXT_PRIV
-       help
-         Say Y here if you intend to attach an Aviator/Raytheon PCMCIA
-         (PC-card) wireless Ethernet networking card to your computer.
-         Please read the file
- <file:Documentation/networking/device_drivers/wifi/ray_cs.rst> for -         details.
-
-         To compile this driver as a module, choose M here: the module will be
-         called ray_cs.  If unsure, say N.

drivers/net/wireless/Kconfig +0 -8

-
-config PCMCIA_WL3501
-       tristate "Planet WL3501 PCMCIA cards"
-       depends on CFG80211 && PCMCIA
-       select WIRELESS_EXT
-       select WEXT_SPY
-       help
-         A driver for WL3501 PCMCIA 802.11 wireless cards made by

Planet.
-         It has basic support for Linux wireless extensions and initial
-         micro support for ethtool.

drivers/net/wireless/Kconfig +0 -26

-
-config USB_NET_RNDIS_WLAN
-       tristate "Wireless RNDIS USB support"
-       depends on USB
-       depends on CFG80211
-       select USB_NET_DRIVERS
-       select USB_USBNET
-       select USB_NET_CDCETHER
-       select USB_NET_RNDIS_HOST
-       help
-         This is a driver for wireless RNDIS devices.
-         These are USB based adapters found in devices such as:
-
-         Buffalo WLI-U2-KG125S
-         U.S. Robotics USR5421
-         Belkin F5D7051
-         Linksys WUSB54GSv2
-         Linksys WUSB54GSC
-         Asus WL169gE
-         Eminent EM4045
-         BT Voyager 1055
-         Linksys WUSB54GSv1
-         U.S. Robotics USR5420
-         BUFFALO WLI-USB-G54
-
-         All of these devices are based on Broadcom 4320 chip which

is the
-         only wireless RNDIS chip known to date. -
-         If you choose to build a module, it'll be called rndis_wlan.
+source "drivers/net/wireless/legacy/Kconfig"

 source "drivers/net/wireless/virtual/Kconfig"

drivers/net/wireless/Makefile +0 -0

index 1b697cfe0a13..4d7374d567d1 100644
@@ -23,10 +23,5 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/

 obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/

drivers/net/wireless/Makefile +1 -6

-# 16-bit wireless PCMCIA client drivers
-obj-$(CONFIG_PCMCIA_RAYCS)     += ray_cs.o
-obj-$(CONFIG_PCMCIA_WL3501)    += wl3501_cs.o
-
-obj-$(CONFIG_USB_NET_RNDIS_WLAN)       += rndis_wlan.o
-
+obj-$(CONFIG_WLAN) += legacy/

 obj-$(CONFIG_WLAN) += virtual/

drivers/net/wireless/legacy/Kconfig new file +8 -0

new file mode 100644
index 000000000000..3a5275941212
@@ -0,0 +1,55 @@
+config PCMCIA_RAYCS
+       tristate "Aviator/Raytheon 2.4GHz wireless support"
+       depends on PCMCIA
+       select WIRELESS_EXT
+       select WEXT_SPY
+       select WEXT_PRIV
+       help
+         Say Y here if you intend to attach an Aviator/Raytheon

PCMCIA
+         (PC-card) wireless Ethernet networking card to your computer.
+         Please read the file
+ <file:Documentation/networking/device_drivers/wifi/ray_cs.rst> for +         details.
+
+         To compile this driver as a module, choose M here: the module will be
+         called ray_cs.  If unsure, say N.

drivers/net/wireless/legacy/Kconfig new file +8 -0

+
+config PCMCIA_WL3501
+       tristate "Planet WL3501 PCMCIA cards"
+       depends on CFG80211 && PCMCIA
+       select WIRELESS_EXT
+       select WEXT_SPY
+       help
+         A driver for WL3501 PCMCIA 802.11 wireless cards made by

Planet.
+         It has basic support for Linux wireless extensions and initial
+         micro support for ethtool.

drivers/net/wireless/legacy/Kconfig new file +26 -0

+
+config USB_NET_RNDIS_WLAN
+       tristate "Wireless RNDIS USB support"
+       depends on USB
+       depends on CFG80211
+       select USB_NET_DRIVERS
+       select USB_USBNET
+       select USB_NET_CDCETHER
+       select USB_NET_RNDIS_HOST
+       help
+         This is a driver for wireless RNDIS devices.
+         These are USB based adapters found in devices such as:
+
+         Buffalo WLI-U2-KG125S
+         U.S. Robotics USR5421
+         Belkin F5D7051
+         Linksys WUSB54GSv2
+         Linksys WUSB54GSC
+         Asus WL169gE
+         Eminent EM4045
+         BT Voyager 1055
+         Linksys WUSB54GSv1
+         U.S. Robotics USR5420
+         BUFFALO WLI-USB-G54
+
+         All of these devices are based on Broadcom 4320 chip which

is the
+         only wireless RNDIS chip known to date. +
+         If you choose to build a module, it'll be called rndis_wlan.

drivers/net/wireless/legacy/Kconfig new file +1 -0

+

drivers/net/wireless/legacy/Makefile new file +6 -0

new file mode 100644
index 000000000000..36878f080bfc
@@ -0,0 +1,6 @@
+# 16-bit wireless PCMCIA client drivers
+obj-$(CONFIG_PCMCIA_RAYCS)     += ray_cs.o
+obj-$(CONFIG_PCMCIA_WL3501)    += wl3501_cs.o
+
+obj-$(CONFIG_USB_NET_RNDIS_WLAN)       += rndis_wlan.o
+

drivers/net/wireless/legacy/ray_cs.c renamed from drivers/net/wireless/ray_cs.c +0 -0

similarity index 100%
rename from drivers/net/wireless/ray_cs.c
rename to drivers/net/wireless/legacy/ray_cs.c

drivers/net/wireless/legacy/ray_cs.h renamed from drivers/net/wireless/ray_cs.h +0 -0

similarity index 100%
rename from drivers/net/wireless/ray_cs.h
rename to drivers/net/wireless/legacy/ray_cs.h

drivers/net/wireless/legacy/rayctl.h renamed from drivers/net/wireless/rayctl.h +0 -0

similarity index 100%
rename from drivers/net/wireless/rayctl.h
rename to drivers/net/wireless/legacy/rayctl.h

drivers/net/wireless/legacy/rndis_wlan.c renamed from drivers/net/wireless/rndis_wlan.c +0 -0

similarity index 100%
rename from drivers/net/wireless/rndis_wlan.c
rename to drivers/net/wireless/legacy/rndis_wlan.c

drivers/net/wireless/legacy/wl3501.h renamed from drivers/net/wireless/wl3501.h +0 -0

similarity index 100%
rename from drivers/net/wireless/wl3501.h
rename to drivers/net/wireless/legacy/wl3501.h

drivers/net/wireless/legacy/wl3501_cs.c renamed from drivers/net/wireless/wl3501_cs.c +0 -0

similarity index 100%
rename from drivers/net/wireless/wl3501_cs.c
rename to drivers/net/wireless/legacy/wl3501_cs.c

Quoted 7 lines · Kalle Valo

To clean up drivers/net/wireless move the old drivers drivers left in the
directory to a new "legacy" directory. I did consider adding CONFIG_WLAN_VENDOR_LEGACY like other vendors have but then dropped the idea as
these are really old drivers and hopefully we get to remove them soon.

Why is rndis_wlan legacy? It supports devices that are way newer than ray_cs or wl3501... like this Linksys WUSB54GSC from late 2007:

[1086339.589565] rndis_wlan 1-3:1.0 wlan0: register 'rndis_wlan' at
usb-0000:00:14.0-3, Wireless RNDIS device, BCM4320b based,
00:1d:7e:9e:2f:bb
[1086339.589961] usbcore: registered new interface driver rndis_wlan

Dunno, just seems a completely different class of devices than old 802.11b-only PCMCIA ones...

Quoted 15 lines · Dan Williams

Quoted 9 lines · Kalle Valo

To clean up drivers/net/wireless move the old drivers drivers left in
the
directory to a new "legacy" directory. I did consider adding CONFIG_WLAN_VENDOR_LEGACY like other vendors have but then dropped
the idea as
these are really old drivers and hopefully we get to remove them soon.

Why is rndis_wlan legacy? It supports devices that are way newer than
ray_cs or wl3501... like this Linksys WUSB54GSC from late 2007:

Quoted 5 lines

[1086339.589565] rndis_wlan 1-3:1.0 wlan0: register 'rndis_wlan' at
usb-0000:00:14.0-3, Wireless RNDIS device, BCM4320b based,
00:1d:7e:9e:2f:bb
[1086339.589961] usbcore: registered new interface driver

rndis_wlan

So you have this device? Does it work? I think I should make a table somewhere for these old drivers with last success reports :)

Quoted 3 lines

Dunno, just seems a completely different class of devices than old 802.11b-only PCMCIA ones...

I was about to say that all drivers using Wireless Extensions are legacy, but to my surprise rndis_wlan actually uses cfg80211 :)

I put this to "legacy" as I didn't find any better location and adding a
new vendor driver just for rndis_wlan felt like overkill. The directory
name "legacy" is just a name, it has no real meaning and users won't see
it either. It could be "misc", "old" or something else as well.

Quoted 23 lines · Kalle Valo

Quoted 20 lines · Dan Williams

Quoted 9 lines · Kalle Valo

To clean up drivers/net/wireless move the old drivers drivers left in
the
directory to a new "legacy" directory. I did consider adding CONFIG_WLAN_VENDOR_LEGACY like other vendors have but then dropped
the idea as
these are really old drivers and hopefully we get to remove them soon.

Why is rndis_wlan legacy? It supports devices that are way newer than
ray_cs or wl3501... like this Linksys WUSB54GSC from late 2007:

[1086339.589565] rndis_wlan 1-3:1.0 wlan0: register 'rndis_wlan' at
usb-0000:00:14.0-3, Wireless RNDIS device, BCM4320b based,
00:1d:7e:9e:2f:bb
[1086339.589961] usbcore: registered new interface driver

rndis_wlan

Quoted 2 lines

So you have this device? Does it work? I think I should make a table somewhere for these old drivers with last success reports :)

Yep, I have it, it works. Needless to say, I don't *use* it.

Quoted 6 lines

Quoted 2 lines

Dunno, just seems a completely different class of devices than old 802.11b-only PCMCIA ones...

I was about to say that all drivers using Wireless Extensions are legacy, but to my surprise rndis_wlan actually uses cfg80211 :)

Quoted 7 lines

I put this to "legacy" as I didn't find any better location and adding a
new vendor driver just for rndis_wlan felt like overkill. The directory
name "legacy" is just a name, it has no real meaning and users won't see
it either. It could be "misc", "old" or something else as well.

Is the goal just to get all the .c individual drivers out of net/wireless?

Also isn't Greg KH out to kill RNDIS too? I don't recall that being a settled question yet, but I lost track.

Quoted 27 lines · Dan Williams

Quoted 26 lines · Kalle Valo

Quoted 23 lines · Dan Williams

Quoted 10 lines · Kalle Valo

To clean up drivers/net/wireless move the old drivers drivers left in
the
directory to a new "legacy" directory. I did consider adding CONFIG_WLAN_VENDOR_LEGACY like other vendors have but then dropped
the idea as
these are really old drivers and hopefully we get to remove them
soon.

Why is rndis_wlan legacy? It supports devices that are way newer
than
ray_cs or wl3501... like this Linksys WUSB54GSC from late 2007:

[1086339.589565] rndis_wlan 1-3:1.0 wlan0: register
'rndis_wlan' at
usb-0000:00:14.0-3, Wireless RNDIS device, BCM4320b based,
00:1d:7e:9e:2f:bb
[1086339.589961] usbcore: registered new interface driver

rndis_wlan

Quoted 5 lines

Quoted 3 lines

So you have this device? Does it work? I think I should make a table
somewhere for these old drivers with last success reports :)

Yep, I have it, it works. Needless to say, I don't *use* it.

Yeah, I guessed that part :) But thanks for testing, good to know it works.

Quoted 16 lines

Quoted 15 lines

Quoted 3 lines

Dunno, just seems a completely different class of devices than old
802.11b-only PCMCIA ones...

I was about to say that all drivers using Wireless Extensions are legacy, but to my surprise rndis_wlan actually uses cfg80211 :)

I put this to "legacy" as I didn't find any better location and adding a
new vendor driver just for rndis_wlan felt like overkill. The directory
name "legacy" is just a name, it has no real meaning and users won't
see
it either. It could be "misc", "old" or something else as well.

Quoted 2 lines

Is the goal just to get all the .c individual drivers out of net/wireless?

Yes, exactly. The extra files in drivers/net/wireless annoy me everytime
when I'm checking something in the tree.

Quoted 3 lines

Also isn't Greg KH out to kill RNDIS too? I don't recall that being a
settled question yet, but I lost track.

I haven't heard anything about that recently, I hope we don't have to remove rndis_wlan from the tree. But wext drivers are another thing, we
really should get rid of them (or convert to cfg80211).

Quoted 6 lines

Quoted 2 lines

Is the goal just to get all the .c individual drivers out of net/wireless?

Yes, exactly. The extra files in drivers/net/wireless annoy me everytime
when I'm checking something in the tree.

ray_cs and wl3501_cs are also PCMCIA drivers (not CardBus) and isn't Arnd trying to get rid of PCMCIA via "[RFC 0/6] pcmcia: separate 16-bit support from cardbus"?

Maybe those two drivers get solved for you :)

Quoted 8 lines

Quoted 3 lines

Also isn't Greg KH out to kill RNDIS too? I don't recall that being a
settled question yet, but I lost track.

I haven't heard anything about that recently, I hope we don't have to remove rndis_wlan from the tree. But wext drivers are another thing, we
really should get rid of them (or convert to cfg80211).

I have vague, morbid interest in converting atmel and prism54 to cfg80211 but timeline on that would be "this year".

Quoted 7 lines · Dan Williams

Quoted 6 lines

Quoted 2 lines

Is the goal just to get all the .c individual drivers out of net/wireless?

Yes, exactly. The extra files in drivers/net/wireless annoy me everytime
when I'm checking something in the tree.

Quoted 5 lines

ray_cs and wl3501_cs are also PCMCIA drivers (not CardBus) and isn't Arnd trying to get rid of PCMCIA via "[RFC 0/6] pcmcia: separate 16-bit support from cardbus"?

Maybe those two drivers get solved for you :)

That would be great :)

Quoted 11 lines

Quoted 8 lines

Quoted 3 lines

Also isn't Greg KH out to kill RNDIS too? I don't recall that being a
settled question yet, but I lost track.

I haven't heard anything about that recently, I hope we don't have to remove rndis_wlan from the tree. But wext drivers are another thing, we
really should get rid of them (or convert to cfg80211).

I have vague, morbid interest in converting atmel and prism54 to cfg80211 but timeline on that would be "this year".

As you already noticed, prism54 is already gone. But I'm keeping fingers crossed that who you would have time to convert atmel :)

We really should get rid of wext, at least from drivers/net/wireless. Staging drivers are of course of another thing. Just for fun I decided to grep how many wext drivers and the first match was an ethernet driver, weird:

drivers/net/ethernet/toshiba/ps3_gelic_wireless.c:2570: netdev->wireless_handlers = &gelic_wl_wext_handler_def;

These are the mainline drivers using wext:

drivers/net/wireless/atmel/atmel.c:1574:        dev->wireless_handlers = &atmel_handler_def; drivers/net/wireless/cisco/airo.c:2674: dev->wireless_handlers = &airo_handler_def; drivers/net/wireless/cisco/airo.c:2828: dev->wireless_handlers = &airo_handler_def; drivers/net/wireless/intel/ipw2x00/ipw2100.c:6032:      dev->wireless_handlers = &ipw2100_wx_handler_def; drivers/net/wireless/intel/ipw2x00/ipw2200.c:11675:     net_dev->wireless_handlers = &ipw_wx_handler_def; drivers/net/wireless/intersil/hostap/hostap_main.c:851: dev->wireless_handlers = &hostap_iw_handler_def; drivers/net/wireless/intersil/orinoco/main.c:2251:      dev->wireless_handlers = &orinoco_handler_def; drivers/net/wireless/ray_cs.c:303:      dev->wireless_handlers = &ray_handler_def; drivers/net/wireless/wl3501_cs.c:1886:  dev->wireless_handlers  = &wl3501_handler_def; drivers/net/wireless/zydas/zd1201.c:1782:       dev->wireless_handlers = &zd1201_iw_handlers;

And these are the staging drivers:

drivers/staging/ks7010/ks_wlan_net.c:2636:      dev->wireless_handlers = &ks_wlan_handler_def; drivers/staging/r8188eu/os_dep/os_intfs.c:358:  pnetdev->wireless_handlers = (struct iw_handler_def *)&rtw_handlers_def; drivers/staging/rtl8192e/rtl8192e/rtl_core.c:2334:      dev->wireless_handlers = &r8192_wx_handlers_def; drivers/staging/rtl8192u/r8192U_core.c:4532:    dev->wireless_handlers = &r8192_wx_handlers_def; drivers/staging/rtl8712/os_intfs.c:214: pnetdev->wireless_handlers = (struct iw_handler_def *)