tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Kalle Valo f79cbc77 95b74450

+25 -22
+1 -19
drivers/net/wireless/Kconfig
··· 64 64 It has basic support for Linux wireless extensions and initial 65 65 micro support for ethtool. 66 66 67 - config MAC80211_HWSIM 68 - tristate "Simulated radio testing tool for mac80211" 69 - depends on MAC80211 70 - help 71 - This driver is a developer testing tool that can be used to test 72 - IEEE 802.11 networking stack (mac80211) functionality. This is not 73 - needed for normal wireless LAN usage and is only for testing. See 74 - Documentation/networking/mac80211_hwsim for more information on how 75 - to use this tool. 76 - 77 - To compile this driver as a module, choose M here: the module will be 78 - called mac80211_hwsim. If unsure, say N. 79 - 80 67 config USB_NET_RNDIS_WLAN 81 68 tristate "Wireless RNDIS USB support" 82 69 depends on USB ··· 93 106 94 107 If you choose to build a module, it'll be called rndis_wlan. 95 108 96 - config VIRT_WIFI 97 - tristate "Wifi wrapper for ethernet drivers" 98 - depends on CFG80211 99 - help 100 - This option adds support for ethernet connections to appear as if they 101 - are wifi connections through a special rtnetlink device. 109 + source "drivers/net/wireless/virtual/Kconfig" 102 110 103 111 endif # WLAN
+1 -3
drivers/net/wireless/Makefile
··· 29 29 30 30 obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o 31 31 32 - obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o 33 - 34 - obj-$(CONFIG_VIRT_WIFI) += virt_wifi.o 32 + obj-$(CONFIG_WLAN) += virtual/
drivers/net/wireless/mac80211_hwsim.c drivers/net/wireless/virtual/mac80211_hwsim.c
drivers/net/wireless/mac80211_hwsim.h drivers/net/wireless/virtual/mac80211_hwsim.h
drivers/net/wireless/virt_wifi.c drivers/net/wireless/virtual/virt_wifi.c
+20
drivers/net/wireless/virtual/Kconfig
··· 1 + config MAC80211_HWSIM 2 + tristate "Simulated radio testing tool for mac80211" 3 + depends on MAC80211 4 + help 5 + This driver is a developer testing tool that can be used to test 6 + IEEE 802.11 networking stack (mac80211) functionality. This is not 7 + needed for normal wireless LAN usage and is only for testing. See 8 + Documentation/networking/mac80211_hwsim for more information on how 9 + to use this tool. 10 + 11 + To compile this driver as a module, choose M here: the module will be 12 + called mac80211_hwsim. If unsure, say N. 13 + 14 + config VIRT_WIFI 15 + tristate "Wifi wrapper for ethernet drivers" 16 + depends on CFG80211 17 + help 18 + This option adds support for ethernet connections to appear as if they 19 + are wifi connections through a special rtnetlink device. 20 +
+3
drivers/net/wireless/virtual/Makefile
··· 1 + obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o 2 + 3 + obj-$(CONFIG_VIRT_WIFI) += virt_wifi.o