make all wext wifi drivers select DRIVER_WEXT_SUPPORT, so that hostapd/wpa_supplicant can make it optional

SVN-Revision: 25518
This commit is contained in:
Felix Fietkau 2011-02-13 14:18:13 +00:00
parent 383d17913f
commit 240b10673d
5 changed files with 13 additions and 6 deletions

View file

@ -25,3 +25,8 @@ config WPA_RFKILL_SUPPORT
bool "Add rfkill support" bool "Add rfkill support"
depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini depends PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mini || PACKAGE_wpad || PACKAGE_wpad-mini
default n default n
config DRIVER_WEXT_SUPPORT
bool
default n

View file

@ -31,7 +31,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_hostapd \ CONFIG_PACKAGE_hostapd \
CONFIG_PACKAGE_hostapd-mini \ CONFIG_PACKAGE_hostapd-mini \
CONFIG_PACKAGE_kmod-hostap \ CONFIG_PACKAGE_kmod-hostap \
CONFIG_WPA_RFKILL_SUPPORT CONFIG_WPA_RFKILL_SUPPORT \
CONFIG_DRIVER_WEXT_SUPPORT
LOCAL_TYPE=$(strip \ LOCAL_TYPE=$(strip \
$(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \ $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \
@ -66,6 +67,7 @@ DRIVER_MAKEOPTS= \
CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \ CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \ CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \
CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) \ CONFIG_IEEE80211W=$(CONFIG_PACKAGE_kmod-ath9k) \
CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
$(if $(CONFIG_WPA_RFKILL_SUPPORT),NEED_RFKILL=y) $(if $(CONFIG_WPA_RFKILL_SUPPORT),NEED_RFKILL=y)
ifneq ($(LOCAL_TYPE),hostapd) ifneq ($(LOCAL_TYPE),hostapd)

View file

@ -42,7 +42,7 @@ $(eval $(call KernelPackage,lib80211))
define KernelPackage/net-airo define KernelPackage/net-airo
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=Cisco Aironet driver TITLE:=Cisco Aironet driver
DEPENDS:=@PCI_SUPPORT DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
KCONFIG:=CONFIG_AIRO KCONFIG:=CONFIG_AIRO
FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko FILES:=$(LINUX_DIR)/drivers/net/wireless/airo.ko
AUTOLOAD:=$(call AutoLoad,50,airo) AUTOLOAD:=$(call AutoLoad,50,airo)
@ -59,7 +59,7 @@ define KernelPackage/net-zd1201
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=Zydas ZD1201 support TITLE:=Zydas ZD1201 support
DEPENDS:=@USB_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) FILES:=$(LINUX_DIR)/drivers/net/wireless/zd1201.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,60,zd1201) AUTOLOAD:=$(call AutoLoad,60,zd1201)
endef endef
@ -112,7 +112,7 @@ $(eval $(call KernelPackage,net-zd1201))
define KernelPackage/net-prism54 define KernelPackage/net-prism54
SUBMENU:=$(WIRELESS_MENU) SUBMENU:=$(WIRELESS_MENU)
TITLE:=Intersil Prism54 support TITLE:=Intersil Prism54 support
DEPENDS:=@PCI_SUPPORT DEPENDS:=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT
KCONFIG:=CONFIG_PRISM54 KCONFIG:=CONFIG_PRISM54
FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko FILES:=$(LINUX_DIR)/drivers/net/wireless/prism54/prism54.ko
AUTOLOAD:=$(call AutoLoad,60,prism54) AUTOLOAD:=$(call AutoLoad,60,prism54)

View file

@ -577,7 +577,7 @@ endef
define KernelPackage/net-hermes define KernelPackage/net-hermes
$(call KernelPackage/mac80211/Default) $(call KernelPackage/mac80211/Default)
TITLE:=Hermes 802.11b chipset support 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 FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko
AUTOLOAD:=$(call AutoLoad,50,orinoco) AUTOLOAD:=$(call AutoLoad,50,orinoco)
endef endef

View file

@ -165,7 +165,7 @@ define KernelPackage/madwifi
TITLE:=Driver for Atheros wireless chipsets TITLE:=Driver for Atheros wireless chipsets
URL:=http://madwifi-project.org/ URL:=http://madwifi-project.org/
MAINTAINER:=Felix Fietkau <nbd@openwrt.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) FILES:=$(MADWIFI_FILES)
AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD))
MENU:=1 MENU:=1