wifi: move mac80211_hwsim and virt_wifi to virtual directory

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 <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20230227121732.8967-2-kvalo@kernel.org

diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig
index cb1c150..42b40cc 100644 (file)
--- a/drivers/net/wireless/Kconfig
+++ b/drivers/net/wireless/Kconfig
@@ -64,19 +64,6 @@ config PCMCIA_WL3501
          It has basic support for Linux wireless extensions and initial
          micro support for ethtool.
 
-config MAC80211_HWSIM
-       tristate "Simulated radio testing tool for mac80211"
-       depends on MAC80211
-       help
-         This driver is a developer testing tool that can be used to test
-         IEEE 802.11 networking stack (mac80211) functionality. This is not
-         needed for normal wireless LAN usage and is only for testing. See
-         Documentation/networking/mac80211_hwsim for more information on how
-         to use this tool.
-
-         To compile this driver as a module, choose M here: the module will be
-         called mac80211_hwsim.  If unsure, say N.
-
 config USB_NET_RNDIS_WLAN
        tristate "Wireless RNDIS USB support"
        depends on USB
@@ -106,11 +93,6 @@ config USB_NET_RNDIS_WLAN
 
          If you choose to build a module, it'll be called rndis_wlan.
 
-config VIRT_WIFI
-       tristate "Wifi wrapper for ethernet drivers"
-       depends on CFG80211
-       help
-         This option adds support for ethernet connections to appear as if they
-         are wifi connections through a special rtnetlink device.
+source "drivers/net/wireless/virtual/Kconfig"
 
 endif # WLAN

diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile
index a61cf6c..1b697cf 100644 (file)
--- a/drivers/net/wireless/Makefile
+++ b/drivers/net/wireless/Makefile
@@ -29,6 +29,4 @@ obj-$(CONFIG_PCMCIA_WL3501)   += wl3501_cs.o
 
 obj-$(CONFIG_USB_NET_RNDIS_WLAN)       += rndis_wlan.o
 
-obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o
-
-obj-$(CONFIG_VIRT_WIFI)        += virt_wifi.o
+obj-$(CONFIG_WLAN) += virtual/

diff --git a/drivers/net/wireless/virtual/Kconfig b/drivers/net/wireless/virtual/Kconfig
new file mode 100644 (file)
index 0000000..fb3b4b6
--- /dev/null
+++ b/drivers/net/wireless/virtual/Kconfig
@@ -0,0 +1,20 @@
+config MAC80211_HWSIM
+       tristate "Simulated radio testing tool for mac80211"
+       depends on MAC80211
+       help
+         This driver is a developer testing tool that can be used to test
+         IEEE 802.11 networking stack (mac80211) functionality. This is not
+         needed for normal wireless LAN usage and is only for testing. See
+         Documentation/networking/mac80211_hwsim for more information on how
+         to use this tool.
+
+         To compile this driver as a module, choose M here: the module will be
+         called mac80211_hwsim.  If unsure, say N.
+
+config VIRT_WIFI
+       tristate "Wifi wrapper for ethernet drivers"
+       depends on CFG80211
+       help
+         This option adds support for ethernet connections to appear as if they
+         are wifi connections through a special rtnetlink device.
+

diff --git a/drivers/net/wireless/virtual/Makefile b/drivers/net/wireless/virtual/Makefile
new file mode 100644 (file)
index 0000000..5773cc6
--- /dev/null
+++ b/drivers/net/wireless/virtual/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_MAC80211_HWSIM)   += mac80211_hwsim.o
+
+obj-$(CONFIG_VIRT_WIFI)        += virt_wifi.o

diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/virtual/mac80211_hwsim.c
similarity index 100%
rename from drivers/net/wireless/mac80211_hwsim.c
rename to drivers/net/wireless/virtual/mac80211_hwsim.c

diff --git a/drivers/net/wireless/mac80211_hwsim.h b/drivers/net/wireless/virtual/mac80211_hwsim.h
similarity index 100%
rename from drivers/net/wireless/mac80211_hwsim.h
rename to drivers/net/wireless/virtual/mac80211_hwsim.h

diff --git a/drivers/net/wireless/virt_wifi.c b/drivers/net/wireless/virtual/virt_wifi.c
similarity index 100%
rename from drivers/net/wireless/virt_wifi.c
rename to drivers/net/wireless/virtual/virt_wifi.c