On Mon, 2023-02-27 at 14:17 +0200, Kalle Valo wrote: > 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... Dan > > There should be no changes in compilation or in Kconfig options, > merely moving files. > > Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxx> > --- > 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%) > > diff --git a/drivers/net/wireless/Kconfig > b/drivers/net/wireless/Kconfig > index 42b40cc96b21..7555af5195ec 100644 > --- a/drivers/net/wireless/Kconfig > +++ b/drivers/net/wireless/Kconfig > @@ -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. > - > -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. > - > -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" > > diff --git a/drivers/net/wireless/Makefile > b/drivers/net/wireless/Makefile > index 1b697cfe0a13..4d7374d567d1 100644 > --- a/drivers/net/wireless/Makefile > +++ b/drivers/net/wireless/Makefile > @@ -23,10 +23,5 @@ obj-$(CONFIG_WLAN_VENDOR_ST) += st/ > obj-$(CONFIG_WLAN_VENDOR_TI) += ti/ > obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/ > > -# 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/ > diff --git a/drivers/net/wireless/legacy/Kconfig > b/drivers/net/wireless/legacy/Kconfig > new file mode 100644 > index 000000000000..3a5275941212 > --- /dev/null > +++ b/drivers/net/wireless/legacy/Kconfig > @@ -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. > + > +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. > + > +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. > + > diff --git a/drivers/net/wireless/legacy/Makefile > b/drivers/net/wireless/legacy/Makefile > new file mode 100644 > index 000000000000..36878f080bfc > --- /dev/null > +++ b/drivers/net/wireless/legacy/Makefile > @@ -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 > + > diff --git a/drivers/net/wireless/ray_cs.c > b/drivers/net/wireless/legacy/ray_cs.c > similarity index 100% > rename from drivers/net/wireless/ray_cs.c > rename to drivers/net/wireless/legacy/ray_cs.c > diff --git a/drivers/net/wireless/ray_cs.h > b/drivers/net/wireless/legacy/ray_cs.h > similarity index 100% > rename from drivers/net/wireless/ray_cs.h > rename to drivers/net/wireless/legacy/ray_cs.h > diff --git a/drivers/net/wireless/rayctl.h > b/drivers/net/wireless/legacy/rayctl.h > similarity index 100% > rename from drivers/net/wireless/rayctl.h > rename to drivers/net/wireless/legacy/rayctl.h > diff --git a/drivers/net/wireless/rndis_wlan.c > b/drivers/net/wireless/legacy/rndis_wlan.c > similarity index 100% > rename from drivers/net/wireless/rndis_wlan.c > rename to drivers/net/wireless/legacy/rndis_wlan.c > diff --git a/drivers/net/wireless/wl3501.h > b/drivers/net/wireless/legacy/wl3501.h > similarity index 100% > rename from drivers/net/wireless/wl3501.h > rename to drivers/net/wireless/legacy/wl3501.h > diff --git a/drivers/net/wireless/wl3501_cs.c > b/drivers/net/wireless/legacy/wl3501_cs.c > similarity index 100% > rename from drivers/net/wireless/wl3501_cs.c > rename to drivers/net/wireless/legacy/wl3501_cs.c