F:     include/net/iw_handler.h
 F:     include/net/wext.h
 F:     include/uapi/linux/nl80211.h
+N:     include/uapi/linux/nl80211-.*
 F:     include/uapi/linux/wireless.h
 F:     net/wireless/
 
 ADM8211 WIRELESS DRIVER
 L:     linux-wireless@vger.kernel.org
 S:     Orphan
-F:     drivers/net/wireless/admtek/adm8211.*
+F:     drivers/net/wireless/admtek/
 
 ADP1050 HARDWARE MONITOR DRIVER
 M:     Radu Sabau <radu.sabau@analog.com>
 
 CW1200 WLAN driver
 S:     Orphan
-F:     drivers/net/wireless/st/cw1200/
+F:     drivers/net/wireless/st/
 F:     include/linux/platform_data/net-cw1200.h
 
 CX18 VIDEO4LINUX DRIVER
 L:     libertas-dev@lists.infradead.org
 S:     Orphan
 F:     drivers/net/wireless/marvell/libertas/
+F:     drivers/net/wireless/marvell/libertas_tf/
 
 MARVELL MACCHIATOBIN SUPPORT
 M:     Russell King <linux@armlinux.org.uk>
 M:     Claudiu Beznea <claudiu.beznea@tuxon.dev>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
-F:     drivers/net/wireless/microchip/wilc1000/
+F:     drivers/net/wireless/microchip/
 
 MICROSEMI MIPS SOCS
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git
 F:     Documentation/devicetree/bindings/net/wireless/
 F:     drivers/net/wireless/
+X:     drivers/net/wireless/ath/
+X:     drivers/net/wireless/broadcom/
+X:     drivers/net/wireless/intel/
+X:     drivers/net/wireless/intersil/
+X:     drivers/net/wireless/marvell/
+X:     drivers/net/wireless/mediatek/mt76/
+X:     drivers/net/wireless/mediatek/mt7601u/
+X:     drivers/net/wireless/microchip/
+X:     drivers/net/wireless/purelifi/
+X:     drivers/net/wireless/quantenna/
+X:     drivers/net/wireless/ralink/
+X:     drivers/net/wireless/realtek/
+X:     drivers/net/wireless/rsi/
+X:     drivers/net/wireless/silabs/
+X:     drivers/net/wireless/st/
+X:     drivers/net/wireless/ti/
+X:     drivers/net/wireless/zydas/
 
 NETWORKING [DSA]
 M:     Andrew Lunn <andrew@lunn.ch>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
 W:     https://wireless.wiki.kernel.org/en/users/Drivers/p54
-F:     drivers/net/wireless/intersil/p54/
+F:     drivers/net/wireless/intersil/
 
 PACKET SOCKETS
 M:     Willem de Bruijn <willemdebruijn.kernel@gmail.com>
 M:     Srinivasan Raju <srini.raju@purelifi.com>
 L:     linux-wireless@vger.kernel.org
 S:     Supported
-F:     drivers/net/wireless/purelifi/plfxlc/
+F:     drivers/net/wireless/purelifi/
 
 PVRUSB2 VIDEO4LINUX DRIVER
 M:     Mike Isely <isely@pobox.com>
 R:     Sergey Matyukevich <geomatsi@gmail.com>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     drivers/net/wireless/quantenna
+F:     drivers/net/wireless/quantenna/
 
 RADEON and AMDGPU DRM DRIVERS
 M:     Alex Deucher <alexander.deucher@amd.com>
 M:     Stanislaw Gruszka <stf_xl@wp.pl>
 L:     linux-wireless@vger.kernel.org
 S:     Maintained
-F:     drivers/net/wireless/ralink/rt2x00/
+F:     drivers/net/wireless/ralink/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
 M:     Jens Axboe <axboe@kernel.dk>
 M:     Jérôme Pouiller <jerome.pouiller@silabs.com>
 S:     Supported
 F:     Documentation/devicetree/bindings/net/wireless/silabs,wfx.yaml
-F:     drivers/net/wireless/silabs/wfx/
+F:     drivers/net/wireless/silabs/
 
 SILICON MOTION SM712 FRAME BUFFER DRIVER
 M:     Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 ZD1211RW WIRELESS DRIVER
 L:     linux-wireless@vger.kernel.org
 S:     Orphan
-F:     drivers/net/wireless/zydas/zd1211rw/
+F:     drivers/net/wireless/zydas/
 
 ZD1301 MEDIA DRIVER
 L:     linux-media@vger.kernel.org