From 240b10673d5bb2b4fab34e6c4c5b8854fdfd6798 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 13 Feb 2011 14:18:13 +0000
Subject: [PATCH] make all wext wifi drivers select DRIVER_WEXT_SUPPORT, so
 that hostapd/wpa_supplicant can make it optional

SVN-Revision: 25518
---
 package/hostapd/Config.in          | 5 +++++
 package/hostapd/Makefile           | 4 +++-
 package/kernel/modules/wireless.mk | 6 +++---
 package/mac80211/Makefile          | 2 +-
 package/madwifi/Makefile           | 2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in
index a74cbae966..2e8d3ebc76 100644
--- a/package/hostapd/Config.in
+++ b/package/hostapd/Config.in
@@ -25,3 +25,8 @@ config WPA_RFKILL_SUPPORT
 	bool "Add rfkill support"
 	depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
 	default n
+
+
+config DRIVER_WEXT_SUPPORT
+	bool
+	default n
diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index b02ff27e72..3b4978fc86 100644
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -31,7 +31,8 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_hostapd \
 	CONFIG_PACKAGE_hostapd-mini \
 	CONFIG_PACKAGE_kmod-hostap \
-	CONFIG_WPA_RFKILL_SUPPORT
+	CONFIG_WPA_RFKILL_SUPPORT \
+	CONFIG_DRIVER_WEXT_SUPPORT
 
 LOCAL_TYPE=$(strip \
 		$(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
@@ -66,6 +67,7 @@ DRIVER_MAKEOPTS= \
 	CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
 	CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \
 	CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) \
+	CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
 	$(if $(CONFIG_WPA_RFKILL_SUPPORT),NEED_RFKILL=y)
 
 ifneq ($(LOCAL_TYPE),hostapd)
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/modules/wireless.mk
index 82680e3f1c..8d46979fb8 100644
--- a/package/kernel/modules/wireless.mk
+++ b/package/kernel/modules/wireless.mk
@@ -42,7 +42,7 @@ $(eval $(call KernelPackage,lib80211))
 define KernelPackage/net-airo
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Cisco Aironet driver
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
   KCONFIG:=CONFIG_AIRO
   FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
   AUTOLOAD:=$(call AutoLoad,50,airo)
@@ -59,7 +59,7 @@ define KernelPackage/net-zd1201
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Zydas ZD1201 support
   DEPENDS:=@USB_SUPPORT
-  KCONFIG:=CONFIG_USB_ZD1201
+  KCONFIG:=CONFIG_USB_ZD1201 +@DRIVER_WEXT_SUPPORT
   FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,60,zd1201)
 endef
@@ -112,7 +112,7 @@ $(eval $(call KernelPackage,net-zd1201))
 define KernelPackage/net-prism54
   SUBMENU:=$(WIRELESS_MENU)
   TITLE:=Intersil Prism54 support
-  DEPENDS:=@PCI_SUPPORT
+  DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
   KCONFIG:=CONFIG_PRISM54
   FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
   AUTOLOAD:=$(call AutoLoad,60,prism54)
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 48af1f76e1..52fb6c1e02 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -577,7 +577,7 @@ endef
 define KernelPackage/net-hermes
   $(call KernelPackage/mac80211/Default)
   TITLE:=Hermes 802.11b chipset support
-  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211
+  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT
   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko
   AUTOLOAD:=$(call AutoLoad,50,orinoco)
 endef
diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile
index bb621ddf33..5b0342a53b 100644
--- a/package/madwifi/Makefile
+++ b/package/madwifi/Makefile
@@ -165,7 +165,7 @@ define KernelPackage/madwifi
   TITLE:=Driver for Atheros wireless chipsets
   URL:=http://madwifi-project.org/
   MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-  DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN)
+  DEPENDS:=+wireless-tools @PCI_SUPPORT @(!(TARGET_avr32||TARGET_cobalt||TARGET_ep93xx||TARGET_etrax||TARGET_octeon||TARGET_pxcab||TARGET_sibyte)||BROKEN) +@DRIVER_WEXT_SUPPORT
   FILES:=$(MADWIFI_FILES)
   AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
   MENU:=1
-- 
2.25.1