Browse Source

hostap: move under intersil vendor directory

Part of reorganising wireless drivers directory and Kconfig.

Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Kalle Valo 9 years ago
parent
commit
eb4f98d5de

+ 1 - 1
MAINTAINERS

@@ -5040,7 +5040,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

+ 1 - 1
drivers/net/wireless/Kconfig

@@ -22,6 +22,7 @@ source "drivers/net/wireless/atmel/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/broadcom/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/cisco/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
 source "drivers/net/wireless/intel/Kconfig"
+source "drivers/net/wireless/intersil/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/marvell/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 source "drivers/net/wireless/st/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
 source "drivers/net/wireless/zydas/Kconfig"
@@ -116,7 +117,6 @@ config MAC80211_HWSIM
 	  called mac80211_hwsim.  If unsure, say N.
 	  called mac80211_hwsim.  If unsure, say N.
 
 
 source "drivers/net/wireless/ath/Kconfig"
 source "drivers/net/wireless/ath/Kconfig"
-source "drivers/net/wireless/hostap/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/orinoco/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/p54/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"
 source "drivers/net/wireless/rt2x00/Kconfig"

+ 1 - 1
drivers/net/wireless/Makefile

@@ -7,6 +7,7 @@ obj-$(CONFIG_WLAN_VENDOR_ATMEL) += atmel/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_BROADCOM) += broadcom/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_CISCO) += cisco/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
 obj-$(CONFIG_WLAN_VENDOR_INTEL) += intel/
+obj-$(CONFIG_WLAN_VENDOR_INTERSIL) += intersil/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_MARVELL) += marvell/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ST) += st/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
 obj-$(CONFIG_WLAN_VENDOR_ZYDAS) += zydas/
@@ -15,7 +16,6 @@ obj-$(CONFIG_HERMES)		+= orinoco/
 
 
 obj-$(CONFIG_PRISM54)		+= prism54/
 obj-$(CONFIG_PRISM54)		+= prism54/
 
 
-obj-$(CONFIG_HOSTAP)		+= hostap/
 obj-$(CONFIG_WLAN)		+= realtek/
 obj-$(CONFIG_WLAN)		+= realtek/
 
 
 # 16-bit wireless PCMCIA client drivers
 # 16-bit wireless PCMCIA client drivers

+ 16 - 0
drivers/net/wireless/intersil/Kconfig

@@ -0,0 +1,16 @@
+config WLAN_VENDOR_INTERSIL
+	bool "Intersil 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_INTERSIL
+
+source "drivers/net/wireless/intersil/hostap/Kconfig"
+
+endif # WLAN_VENDOR_INTERSIL

+ 1 - 0
drivers/net/wireless/intersil/Makefile

@@ -0,0 +1 @@
+obj-$(CONFIG_HOSTAP)		+= hostap/

+ 0 - 0
drivers/net/wireless/hostap/Kconfig → drivers/net/wireless/intersil/hostap/Kconfig


+ 0 - 0
drivers/net/wireless/hostap/Makefile → drivers/net/wireless/intersil/hostap/Makefile


+ 0 - 0
drivers/net/wireless/hostap/hostap.h → drivers/net/wireless/intersil/hostap/hostap.h


+ 0 - 0
drivers/net/wireless/hostap/hostap_80211.h → drivers/net/wireless/intersil/hostap/hostap_80211.h


+ 0 - 0
drivers/net/wireless/hostap/hostap_80211_rx.c → drivers/net/wireless/intersil/hostap/hostap_80211_rx.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_80211_tx.c → drivers/net/wireless/intersil/hostap/hostap_80211_tx.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_ap.c → drivers/net/wireless/intersil/hostap/hostap_ap.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_ap.h → drivers/net/wireless/intersil/hostap/hostap_ap.h


+ 0 - 0
drivers/net/wireless/hostap/hostap_common.h → drivers/net/wireless/intersil/hostap/hostap_common.h


+ 0 - 0
drivers/net/wireless/hostap/hostap_config.h → drivers/net/wireless/intersil/hostap/hostap_config.h


+ 0 - 0
drivers/net/wireless/hostap/hostap_cs.c → drivers/net/wireless/intersil/hostap/hostap_cs.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_download.c → drivers/net/wireless/intersil/hostap/hostap_download.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_hw.c → drivers/net/wireless/intersil/hostap/hostap_hw.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_info.c → drivers/net/wireless/intersil/hostap/hostap_info.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_ioctl.c → drivers/net/wireless/intersil/hostap/hostap_ioctl.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_main.c → drivers/net/wireless/intersil/hostap/hostap_main.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_pci.c → drivers/net/wireless/intersil/hostap/hostap_pci.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_plx.c → drivers/net/wireless/intersil/hostap/hostap_plx.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_proc.c → drivers/net/wireless/intersil/hostap/hostap_proc.c


+ 0 - 0
drivers/net/wireless/hostap/hostap_wlan.h → drivers/net/wireless/intersil/hostap/hostap_wlan.h