Merge tag 'wireless-drivers-next-for-davem-2015-11-25' of... (c52fd05a) · Commits · 戴 / test

MAINTAINERS

+23 −23

Original line number	Original line	Diff line number	Diff line
	@@ -388,7 +388,7 @@ ADM8211 WIRELESS DRIVER
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/		W: http://wireless.kernel.org/
	S: Orphan		S: Orphan
	F: drivers/net/wireless/adm8211.*		F: drivers/net/wireless/admtek/adm8211.*

	ADP1653 FLASH CONTROLLER DRIVER		ADP1653 FLASH CONTROLLER DRIVER
	M: Sakari Ailus <sakari.ailus@iki.fi>		M: Sakari Ailus <sakari.ailus@iki.fi>
	@@ -1992,7 +1992,7 @@ L: linux-wireless@vger.kernel.org
	W: http://www.thekelleys.org.uk/atmel		W: http://www.thekelleys.org.uk/atmel
	W: http://atmelwlandriver.sourceforge.net/		W: http://atmelwlandriver.sourceforge.net/
	S: Maintained		S: Maintained
	F: drivers/net/wireless/atmel*		F: drivers/net/wireless/atmel/atmel*

	ATMEL MAXTOUCH DRIVER		ATMEL MAXTOUCH DRIVER
	M: Nick Dyer <nick.dyer@itdev.co.uk>		M: Nick Dyer <nick.dyer@itdev.co.uk>
	@@ -2081,7 +2081,7 @@ L: linux-wireless@vger.kernel.org
	L: b43-dev@lists.infradead.org		L: b43-dev@lists.infradead.org
	W: http://wireless.kernel.org/en/users/Drivers/b43		W: http://wireless.kernel.org/en/users/Drivers/b43
	S: Odd Fixes		S: Odd Fixes
	F: drivers/net/wireless/b43/		F: drivers/net/wireless/broadcom/b43/

	B43LEGACY WIRELESS DRIVER		B43LEGACY WIRELESS DRIVER
	M: Larry Finger <Larry.Finger@lwfinger.net>		M: Larry Finger <Larry.Finger@lwfinger.net>
	@@ -2089,7 +2089,7 @@ L: linux-wireless@vger.kernel.org
	L: b43-dev@lists.infradead.org		L: b43-dev@lists.infradead.org
	W: http://wireless.kernel.org/en/users/Drivers/b43		W: http://wireless.kernel.org/en/users/Drivers/b43
	S: Maintained		S: Maintained
	F: drivers/net/wireless/b43legacy/		F: drivers/net/wireless/broadcom/b43legacy/

	BACKLIGHT CLASS/SUBSYSTEM		BACKLIGHT CLASS/SUBSYSTEM
	M: Jingoo Han <jingoohan1@gmail.com>		M: Jingoo Han <jingoohan1@gmail.com>
	@@ -2391,7 +2391,7 @@ M: Hante Meuleman <meuleman@broadcom.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: brcm80211-dev-list@broadcom.com		L: brcm80211-dev-list@broadcom.com
	S: Supported		S: Supported
	F: drivers/net/wireless/brcm80211/		F: drivers/net/wireless/broadcom/brcm80211/

	BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER		BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
	M: QLogic-Storage-Upstream@qlogic.com		M: QLogic-Storage-Upstream@qlogic.com
	@@ -3101,7 +3101,7 @@ F: sound/pci/cs5535audio/
	CW1200 WLAN driver		CW1200 WLAN driver
	M: Solomon Peachy <pizza@shaftnet.org>		M: Solomon Peachy <pizza@shaftnet.org>
	S: Maintained		S: Maintained
	F: drivers/net/wireless/cw1200/		F: drivers/net/wireless/st/cw1200/

	CX18 VIDEO4LINUX DRIVER		CX18 VIDEO4LINUX DRIVER
	M: Andy Walls <awalls@md.metrocast.net>		M: Andy Walls <awalls@md.metrocast.net>
	@@ -5041,7 +5041,7 @@ L: hostap@shmoo.com (subscribers-only)
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://hostap.epitest.fi/		W: http://hostap.epitest.fi/
	S: Maintained		S: Maintained
	F: drivers/net/wireless/hostap/		F: drivers/net/wireless/intersil/hostap/

	HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER		HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
	L: platform-driver-x86@vger.kernel.org		L: platform-driver-x86@vger.kernel.org
	@@ -5609,7 +5609,7 @@ L: linux-wireless@vger.kernel.org
	S: Maintained		S: Maintained
	F: Documentation/networking/README.ipw2100		F: Documentation/networking/README.ipw2100
	F: Documentation/networking/README.ipw2200		F: Documentation/networking/README.ipw2200
	F: drivers/net/wireless/ipw2x00/		F: drivers/net/wireless/intel/ipw2x00/

	INTEL(R) TRACE HUB		INTEL(R) TRACE HUB
	M: Alexander Shishkin <alexander.shishkin@linux.intel.com>		M: Alexander Shishkin <alexander.shishkin@linux.intel.com>
	@@ -5643,7 +5643,7 @@ INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)
	M: Stanislaw Gruszka <sgruszka@redhat.com>		M: Stanislaw Gruszka <sgruszka@redhat.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Supported		S: Supported
	F: drivers/net/wireless/iwlegacy/		F: drivers/net/wireless/intel/iwlegacy/

	INTEL WIRELESS WIFI LINK (iwlwifi)		INTEL WIRELESS WIFI LINK (iwlwifi)
	M: Johannes Berg <johannes.berg@intel.com>		M: Johannes Berg <johannes.berg@intel.com>
	@@ -5653,7 +5653,7 @@ L: linux-wireless@vger.kernel.org
	W: http://intellinuxwireless.org		W: http://intellinuxwireless.org
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
	S: Supported		S: Supported
	F: drivers/net/wireless/iwlwifi/		F: drivers/net/wireless/intel/iwlwifi/

	INTEL MANAGEMENT ENGINE (mei)		INTEL MANAGEMENT ENGINE (mei)
	M: Tomas Winkler <tomas.winkler@intel.com>		M: Tomas Winkler <tomas.winkler@intel.com>
	@@ -6703,7 +6703,7 @@ F: drivers/net/ethernet/marvell/sk*
	MARVELL LIBERTAS WIRELESS DRIVER		MARVELL LIBERTAS WIRELESS DRIVER
	L: libertas-dev@lists.infradead.org		L: libertas-dev@lists.infradead.org
	S: Orphan		S: Orphan
	F: drivers/net/wireless/libertas/		F: drivers/net/wireless/marvell/libertas/

	MARVELL MV643XX ETHERNET DRIVER		MARVELL MV643XX ETHERNET DRIVER
	M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>		M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
	@@ -6723,13 +6723,13 @@ M: Amitkumar Karwar <akarwar@marvell.com>
	M: Nishant Sarmukadam <nishants@marvell.com>		M: Nishant Sarmukadam <nishants@marvell.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/net/wireless/mwifiex/		F: drivers/net/wireless/marvell/mwifiex/

	MARVELL MWL8K WIRELESS DRIVER		MARVELL MWL8K WIRELESS DRIVER
	M: Lennert Buytenhek <buytenh@wantstofly.org>		M: Lennert Buytenhek <buytenh@wantstofly.org>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Odd Fixes		S: Odd Fixes
	F: drivers/net/wireless/mwl8k.c		F: drivers/net/wireless/marvell/mwl8k.c

	MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER		MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
	M: Nicolas Pitre <nico@fluxnic.net>		M: Nicolas Pitre <nico@fluxnic.net>
	@@ -7933,7 +7933,7 @@ L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/en/users/Drivers/orinoco		W: http://wireless.kernel.org/en/users/Drivers/orinoco
	W: http://www.nongnu.org/orinoco/		W: http://www.nongnu.org/orinoco/
	S: Orphan		S: Orphan
	F: drivers/net/wireless/orinoco/		F: drivers/net/wireless/intersil/orinoco/

	OSD LIBRARY and FILESYSTEM		OSD LIBRARY and FILESYSTEM
	M: Boaz Harrosh <ooo@electrozaur.com>		M: Boaz Harrosh <ooo@electrozaur.com>
	@@ -7959,7 +7959,7 @@ M: Christian Lamparter <chunkeey@googlemail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/en/users/Drivers/p54		W: http://wireless.kernel.org/en/users/Drivers/p54
	S: Maintained		S: Maintained
	F: drivers/net/wireless/p54/		F: drivers/net/wireless/intersil/p54/

	PA SEMI ETHERNET DRIVER		PA SEMI ETHERNET DRIVER
	M: Olof Johansson <olof@lixom.net>		M: Olof Johansson <olof@lixom.net>
	@@ -8501,7 +8501,7 @@ M: "Luis R. Rodriguez" <mcgrof@gmail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/en/users/Drivers/p54		W: http://wireless.kernel.org/en/users/Drivers/p54
	S: Obsolete		S: Obsolete
	F: drivers/net/wireless/prism54/		F: drivers/net/wireless/intersil/prism54/

	PS3 NETWORK SUPPORT		PS3 NETWORK SUPPORT
	M: Geoff Levand <geoff@infradead.org>		M: Geoff Levand <geoff@infradead.org>
	@@ -8804,7 +8804,7 @@ M: Stanislaw Gruszka <sgruszka@redhat.com>
	M: Helmut Schaa <helmut.schaa@googlemail.com>		M: Helmut Schaa <helmut.schaa@googlemail.com>
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	S: Maintained		S: Maintained
	F: drivers/net/wireless/rt2x00/		F: drivers/net/wireless/ralink/rt2x00/

	RAMDISK RAM BLOCK DEVICE DRIVER		RAMDISK RAM BLOCK DEVICE DRIVER
	M: Jens Axboe <axboe@kernel.dk>		M: Jens Axboe <axboe@kernel.dk>
	@@ -9038,7 +9038,7 @@ L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/		W: http://wireless.kernel.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
	S: Orphan		S: Orphan
	F: drivers/net/wireless/rtl818x/rtl8180/		F: drivers/net/wireless/realtek/rtl818x/rtl8180/

	RTL8187 WIRELESS DRIVER		RTL8187 WIRELESS DRIVER
	M: Herton Ronaldo Krzesinski <herton@canonical.com>		M: Herton Ronaldo Krzesinski <herton@canonical.com>
	@@ -9048,7 +9048,7 @@ L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/		W: http://wireless.kernel.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
	S: Maintained		S: Maintained
	F: drivers/net/wireless/rtl818x/rtl8187/		F: drivers/net/wireless/realtek/rtl818x/rtl8187/

	RTL8192CE WIRELESS DRIVER		RTL8192CE WIRELESS DRIVER
	M: Larry Finger <Larry.Finger@lwfinger.net>		M: Larry Finger <Larry.Finger@lwfinger.net>
	@@ -9057,8 +9057,8 @@ L: linux-wireless@vger.kernel.org
	W: http://wireless.kernel.org/		W: http://wireless.kernel.org/
	T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git		T: git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
	S: Maintained		S: Maintained
	F: drivers/net/wireless/rtlwifi/		F: drivers/net/wireless/realtek/rtlwifi/
	F: drivers/net/wireless/rtlwifi/rtl8192ce/		F: drivers/net/wireless/realtek/rtlwifi/rtl8192ce/

	RTL8XXXU WIRELESS DRIVER (rtl8xxxu)		RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
	M: Jes Sorensen <Jes.Sorensen@redhat.com>		M: Jes Sorensen <Jes.Sorensen@redhat.com>
	@@ -11255,7 +11255,7 @@ USB ZD1201 DRIVER
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	W: http://linux-lc100020.sourceforge.net		W: http://linux-lc100020.sourceforge.net
	S: Orphan		S: Orphan
	F: drivers/net/wireless/zd1201.*		F: drivers/net/wireless/zydas/zd1201.*

	USB ZR364XX DRIVER		USB ZR364XX DRIVER
	M: Antoine Jacquet <royale@zerezo.com>		M: Antoine Jacquet <royale@zerezo.com>
	@@ -11886,7 +11886,7 @@ W: http://zd1211.ath.cx/wiki/DriverRewrite
	L: linux-wireless@vger.kernel.org		L: linux-wireless@vger.kernel.org
	L: zd1211-devs@lists.sourceforge.net (subscribers-only)		L: zd1211-devs@lists.sourceforge.net (subscribers-only)
	S: Maintained		S: Maintained
	F: drivers/net/wireless/zd1211rw/		F: drivers/net/wireless/zydas/zd1211rw/

	ZPOOL COMPRESSED PAGE STORAGE API		ZPOOL COMPRESSED PAGE STORAGE API
	M: Dan Streetman <ddstreet@ieee.org>		M: Dan Streetman <ddstreet@ieee.org>

drivers/net/wireless/Kconfig

+26 −212

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,22 @@ menuconfig WLAN

	if WLAN		if WLAN

			source "drivers/net/wireless/admtek/Kconfig"
			source "drivers/net/wireless/ath/Kconfig"
			source "drivers/net/wireless/atmel/Kconfig"
			source "drivers/net/wireless/broadcom/Kconfig"
			source "drivers/net/wireless/cisco/Kconfig"
			source "drivers/net/wireless/intel/Kconfig"
			source "drivers/net/wireless/intersil/Kconfig"
			source "drivers/net/wireless/marvell/Kconfig"
			source "drivers/net/wireless/mediatek/Kconfig"
			source "drivers/net/wireless/ralink/Kconfig"
			source "drivers/net/wireless/realtek/Kconfig"
			source "drivers/net/wireless/rsi/Kconfig"
			source "drivers/net/wireless/st/Kconfig"
			source "drivers/net/wireless/ti/Kconfig"
			source "drivers/net/wireless/zydas/Kconfig"

	config PCMCIA_RAYCS		config PCMCIA_RAYCS
	tristate "Aviator/Raytheon 2.4GHz wireless support"		tristate "Aviator/Raytheon 2.4GHz wireless support"
	depends on PCMCIA		depends on PCMCIA
	@@ -32,110 +48,6 @@ config PCMCIA_RAYCS
	To compile this driver as a module, choose M here: the module will be		To compile this driver as a module, choose M here: the module will be
	called ray_cs. If unsure, say N.		called ray_cs. If unsure, say N.

	config LIBERTAS_THINFIRM
	tristate "Marvell 8xxx Libertas WLAN driver support with thin firmware"
	depends on MAC80211
	select FW_LOADER
	---help---
	A library for Marvell Libertas 8xxx devices using thinfirm.

	config LIBERTAS_THINFIRM_DEBUG
	bool "Enable full debugging output in the Libertas thin firmware module."
	depends on LIBERTAS_THINFIRM
	---help---
	Debugging support.

	config LIBERTAS_THINFIRM_USB
	tristate "Marvell Libertas 8388 USB 802.11b/g cards with thin firmware"
	depends on LIBERTAS_THINFIRM && USB
	---help---
	A driver for Marvell Libertas 8388 USB devices using thinfirm.

	config AIRO
	tristate "Cisco/Aironet 34X/35X/4500/4800 ISA and PCI cards"
	depends on CFG80211 && ISA_DMA_API && (PCI \|\| BROKEN)
	select WIRELESS_EXT
	select CRYPTO
	select WEXT_SPY
	select WEXT_PRIV
	---help---
	This is the standard Linux driver to support Cisco/Aironet ISA and
	PCI 802.11 wireless cards.
	It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
	- with or without encryption) as well as card before the Cisco
	acquisition (Aironet 4500, Aironet 4800, Aironet 4800B).

	This driver support both the standard Linux Wireless Extensions
	and Cisco proprietary API, so both the Linux Wireless Tools and the
	Cisco Linux utilities can be used to configure the card.

	The driver can be compiled as a module and will be named "airo".

	config ATMEL
	tristate "Atmel at76c50x chipset 802.11b support"
	depends on CFG80211 && (PCI \|\| PCMCIA)
	select WIRELESS_EXT
	select WEXT_PRIV
	select FW_LOADER
	select CRC32
	---help---
	A driver 802.11b wireless cards based on the Atmel fast-vnet
	chips. This driver supports standard Linux wireless extensions.

	Many cards based on this chipset do not have flash memory
	and need their firmware loaded at start-up. If yours is
	one of these, you will need to provide a firmware image
	to be loaded into the card by the driver. The Atmel
	firmware package can be downloaded from
	<http://www.thekelleys.org.uk/atmel>

	config PCI_ATMEL
	tristate "Atmel at76c506 PCI cards"
	depends on ATMEL && PCI
	---help---
	Enable support for PCI and mini-PCI cards containing the
	Atmel at76c506 chip.

	config PCMCIA_ATMEL
	tristate "Atmel at76c502/at76c504 PCMCIA cards"
	depends on ATMEL && PCMCIA
	select WIRELESS_EXT
	select FW_LOADER
	select CRC32
	---help---
	Enable support for PCMCIA cards containing the
	Atmel at76c502 and at76c504 chips.

	config AT76C50X_USB
	tristate "Atmel at76c503/at76c505/at76c505a USB cards"
	depends on MAC80211 && USB
	select FW_LOADER
	---help---
	Enable support for USB Wireless devices using Atmel at76c503,
	at76c505 or at76c505a chips.

	config AIRO_CS
	tristate "Cisco/Aironet 34X/35X/4500/4800 PCMCIA cards"
	depends on CFG80211 && PCMCIA && (BROKEN \|\| !M32R)
	select WIRELESS_EXT
	select WEXT_SPY
	select WEXT_PRIV
	select CRYPTO
	select CRYPTO_AES
	---help---
	This is the standard Linux driver to support Cisco/Aironet PCMCIA
	802.11 wireless cards. This driver is the same as the Aironet
	driver part of the Linux Pcmcia package.
	It supports the new 802.11b cards from Cisco (Cisco 34X, Cisco 35X
	- with or without encryption) as well as card before the Cisco
	acquisition (Aironet 4500, Aironet 4800, Aironet 4800B). It also
	supports OEM of Cisco such as the DELL TrueMobile 4800 and Xircom
	802.11b cards.

	This driver support both the standard Linux Wireless Extensions
	and Cisco proprietary API, so both the Linux Wireless Tools and the
	Cisco Linux utilities can be used to configure the card.

	config PCMCIA_WL3501		config PCMCIA_WL3501
	tristate "Planet WL3501 PCMCIA cards"		tristate "Planet WL3501 PCMCIA cards"
	depends on CFG80211 && PCMCIA		depends on CFG80211 && PCMCIA
	@@ -146,44 +58,18 @@ config PCMCIA_WL3501
	It has basic support for Linux wireless extensions and initial		It has basic support for Linux wireless extensions and initial
	micro support for ethtool.		micro support for ethtool.

	config PRISM54		config MAC80211_HWSIM
	tristate 'Intersil Prism GT/Duette/Indigo PCI/Cardbus (DEPRECATED)'		tristate "Simulated radio testing tool for mac80211"
	depends on PCI		depends on MAC80211
	select WIRELESS_EXT
	select WEXT_SPY
	select WEXT_PRIV
	select FW_LOADER
	---help---
	This enables support for FullMAC PCI/Cardbus prism54 devices. This
	driver is now deprecated in favor for the SoftMAC driver, p54pci.
	p54pci supports FullMAC PCI/Cardbus devices as well.

	For more information refer to the p54 wiki:

	http://wireless.kernel.org/en/users/Drivers/p54

	Note: You need a motherboard with DMA support to use any of these cards

	When built as module you get the module prism54

	config USB_ZD1201
	tristate "USB ZD1201 based Wireless device support"
	depends on CFG80211 && USB
	select WIRELESS_EXT
	select WEXT_PRIV
	select FW_LOADER
	---help---		---help---
	Say Y if you want to use wireless LAN adapters based on the ZyDAS		This driver is a developer testing tool that can be used to test
	ZD1201 chip.		IEEE 802.11 networking stack (mac80211) functionality. This is not
			needed for normal wireless LAN usage and is only for testing. See
	This driver makes the adapter appear as a normal Ethernet interface,		Documentation/networking/mac80211_hwsim for more information on how
	typically on wlan0.		to use this tool.

	The zd1201 device requires external firmware to be loaded.
	This can be found at http://linux-lc100020.sourceforge.net/

	To compile this driver as a module, choose M here: the		To compile this driver as a module, choose M here: the module will be
	module will be called zd1201.		called mac80211_hwsim. If unsure, say N.

	config USB_NET_RNDIS_WLAN		config USB_NET_RNDIS_WLAN
	tristate "Wireless RNDIS USB support"		tristate "Wireless RNDIS USB support"
	@@ -214,76 +100,4 @@ config USB_NET_RNDIS_WLAN

	If you choose to build a module, it'll be called rndis_wlan.		If you choose to build a module, it'll be called rndis_wlan.

	config ADM8211
	tristate "ADMtek ADM8211 support"
	depends on MAC80211 && PCI
	select CRC32
	select EEPROM_93CX6
	---help---
	This driver is for ADM8211A, ADM8211B, and ADM8211C based cards.
	These are PCI/mini-PCI/Cardbus 802.11b chips found in cards such as:

	Xterasys Cardbus XN-2411b
	Blitz NetWave Point PC
	TrendNet 221pc
	Belkin F5D6001
	SMC 2635W
	Linksys WPC11 v1
	Fiberline FL-WL-200X
	3com Office Connect (3CRSHPW796)
	Corega WLPCIB-11
	SMC 2602W V2 EU
	D-Link DWL-520 Revision C

	However, some of these cards have been replaced with other chips
	like the RTL8180L (Xterasys Cardbus XN-2411b, Belkin F5D6001) or
	the Ralink RT2400 (SMC2635W) without a model number change.

	Thanks to Infineon-ADMtek for their support of this driver.

	source "drivers/net/wireless/realtek/rtl818x/Kconfig"

	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 MWL8K
	tristate "Marvell 88W8xxx PCI/PCIe Wireless support"
	depends on MAC80211 && PCI
	---help---
	This driver supports Marvell TOPDOG 802.11 wireless cards.

	To compile this driver as a module, choose M here: the module
	will be called mwl8k. If unsure, say N.

	source "drivers/net/wireless/ath/Kconfig"
	source "drivers/net/wireless/b43/Kconfig"
	source "drivers/net/wireless/b43legacy/Kconfig"
	source "drivers/net/wireless/brcm80211/Kconfig"
	source "drivers/net/wireless/hostap/Kconfig"
	source "drivers/net/wireless/ipw2x00/Kconfig"
	source "drivers/net/wireless/iwlwifi/Kconfig"
	source "drivers/net/wireless/iwlegacy/Kconfig"
	source "drivers/net/wireless/libertas/Kconfig"
	source "drivers/net/wireless/orinoco/Kconfig"
	source "drivers/net/wireless/p54/Kconfig"
	source "drivers/net/wireless/rt2x00/Kconfig"
	source "drivers/net/wireless/mediatek/Kconfig"
	source "drivers/net/wireless/realtek/rtlwifi/Kconfig"
	source "drivers/net/wireless/realtek/rtl8xxxu/Kconfig"
	source "drivers/net/wireless/ti/Kconfig"
	source "drivers/net/wireless/zd1211rw/Kconfig"
	source "drivers/net/wireless/mwifiex/Kconfig"
	source "drivers/net/wireless/cw1200/Kconfig"
	source "drivers/net/wireless/rsi/Kconfig"

	endif # WLAN		endif # WLAN

drivers/net/wireless/Makefile

+15 −50

Original line number	Original line	Diff line number	Diff line
	@@ -2,27 +2,21 @@
	# Makefile for the Linux Wireless network device drivers.		# Makefile for the Linux Wireless network device drivers.
	#		#

	obj-$(CONFIG_IPW2100) += ipw2x00/		obj-$(CONFIG_WLAN_VENDOR_ADMTEK) += admtek/
	obj-$(CONFIG_IPW2200) += ipw2x00/		obj-$(CONFIG_WLAN_VENDOR_ATH) += ath/
			obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
	obj-$(CONFIG_HERMES) += orinoco/		obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
			obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
	obj-$(CONFIG_AIRO) += airo.o		obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
	obj-$(CONFIG_AIRO_CS) += airo_cs.o airo.o		obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
			obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
	obj-$(CONFIG_ATMEL) += atmel.o		obj-$(CONFIG_WLAN_VENDOR_MEDIATEK) += mediatek/
	obj-$(CONFIG_PCI_ATMEL) += atmel_pci.o		obj-$(CONFIG_WLAN_VENDOR_RALINK) += ralink/
	obj-$(CONFIG_PCMCIA_ATMEL) += atmel_cs.o		obj-$(CONFIG_WLAN_VENDOR_REALTEK) += realtek/
			obj-$(CONFIG_WLAN_VENDOR_RSI) += rsi/
	obj-$(CONFIG_AT76C50X_USB) += at76c50x-usb.o		obj-$(CONFIG_WLAN_VENDOR_ST) += st/
			obj-$(CONFIG_WLAN_VENDOR_TI) += ti/
	obj-$(CONFIG_PRISM54) += prism54/		obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/

	obj-$(CONFIG_HOSTAP) += hostap/
	obj-$(CONFIG_B43) += b43/
	obj-$(CONFIG_B43LEGACY) += b43legacy/
	obj-$(CONFIG_ZD1211RW) += zd1211rw/
	obj-$(CONFIG_WLAN) += realtek/

	# 16-bit wireless PCMCIA client drivers		# 16-bit wireless PCMCIA client drivers
	obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o		obj-$(CONFIG_PCMCIA_RAYCS) += ray_cs.o
	@@ -30,33 +24,4 @@ obj-$(CONFIG_PCMCIA_WL3501) += wl3501_cs.o

	obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o		obj-$(CONFIG_USB_NET_RNDIS_WLAN) += rndis_wlan.o

	obj-$(CONFIG_USB_ZD1201) += zd1201.o
	obj-$(CONFIG_LIBERTAS) += libertas/

	obj-$(CONFIG_LIBERTAS_THINFIRM) += libertas_tf/

	obj-$(CONFIG_ADM8211) += adm8211.o

	obj-$(CONFIG_MWL8K) += mwl8k.o

	obj-$(CONFIG_IWLWIFI) += iwlwifi/
	obj-$(CONFIG_IWLEGACY) += iwlegacy/
	obj-$(CONFIG_RT2X00) += rt2x00/

	obj-$(CONFIG_WL_MEDIATEK) += mediatek/

	obj-$(CONFIG_P54_COMMON) += p54/

	obj-$(CONFIG_ATH_CARDS) += ath/

	obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o		obj-$(CONFIG_MAC80211_HWSIM) += mac80211_hwsim.o

	obj-$(CONFIG_WL_TI) += ti/

	obj-$(CONFIG_MWIFIEX) += mwifiex/

	obj-$(CONFIG_BRCMFMAC) += brcm80211/
	obj-$(CONFIG_BRCMSMAC) += brcm80211/

	obj-$(CONFIG_CW1200) += cw1200/
	obj-$(CONFIG_RSI_91X) += rsi/

drivers/net/wireless/admtek/Kconfig

0 → 100644

+41 −0

Original line number	Original line	Diff line number	Diff line
			config WLAN_VENDOR_ADMTEK
			bool "ADMtek devices"
			default y
			---help---
			If you have a wireless card belonging to this class, say Y.

			Note that the answer to this question doesn't directly affect the
			kernel: saying N will just cause the configurator to skip all
			the questions about cards. If you say Y, you will be asked for
			your specific card in the following questions.

			if WLAN_VENDOR_ADMTEK

			config ADM8211
			tristate "ADMtek ADM8211 support"
			depends on MAC80211 && PCI
			select CRC32
			select EEPROM_93CX6
			---help---
			This driver is for ADM8211A, ADM8211B, and ADM8211C based cards.
			These are PCI/mini-PCI/Cardbus 802.11b chips found in cards such as:

			Xterasys Cardbus XN-2411b
			Blitz NetWave Point PC
			TrendNet 221pc
			Belkin F5D6001
			SMC 2635W
			Linksys WPC11 v1
			Fiberline FL-WL-200X
			3com Office Connect (3CRSHPW796)
			Corega WLPCIB-11
			SMC 2602W V2 EU
			D-Link DWL-520 Revision C

			However, some of these cards have been replaced with other chips
			like the RTL8180L (Xterasys Cardbus XN-2411b, Belkin F5D6001) or
			the Ralink RT2400 (SMC2635W) without a model number change.

			Thanks to Infineon-ADMtek for their support of this driver.

			endif # WLAN_VENDOR_ADMTEK

drivers/net/wireless/admtek/Makefile

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			obj-$(CONFIG_ADM8211) += adm8211.o

Admin message