diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-17 20:21:28 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-03-17 20:21:28 +0000 |
| commit | ab31e75d1bc662e62bfea938e4048a395053f51a (patch) | |
| tree | 8a6e590bd10b3f809bd3c0632fc0f892ebbb611e | |
| parent | cf9aad98a9207b7c6d8d199e77b39fa5a0ddc249 (diff) | |
hostapd: add a separate config symbol for 802.11n driver support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26212 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/hostapd/Config.in | 4 | ||||
| -rw-r--r-- | package/hostapd/Makefile | 10 | ||||
| -rw-r--r-- | package/mac80211/Makefile | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/package/hostapd/Config.in b/package/hostapd/Config.in index 2e8d3ebc7..a88f977c1 100644 --- a/package/hostapd/Config.in +++ b/package/hostapd/Config.in @@ -30,3 +30,7 @@ config WPA_RFKILL_SUPPORT config DRIVER_WEXT_SUPPORT bool default n + +config DRIVER_11N_SUPPORT + bool + default n diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile index 83622b41b..6fcd99803 100644 --- a/package/hostapd/Makefile +++ b/package/hostapd/Makefile @@ -25,14 +25,14 @@ PKG_BUILD_DEPENDS:= \ PKG_CONFIG_DEPENDS:= \ CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK \ CONFIG_PACKAGE_kmod-ath9k \ - CONFIG_PACKAGE_kmod-rt2800-lib \ CONFIG_PACKAGE_kmod-mac80211 \ CONFIG_PACKAGE_kmod-madwifi \ CONFIG_PACKAGE_hostapd \ CONFIG_PACKAGE_hostapd-mini \ CONFIG_PACKAGE_kmod-hostap \ CONFIG_WPA_RFKILL_SUPPORT \ - CONFIG_DRIVER_WEXT_SUPPORT + CONFIG_DRIVER_WEXT_SUPPORT \ + CONFIG_DRIVER_11N_SUPPORT LOCAL_TYPE=$(strip \ $(if $(findstring wpad,$(BUILD_VARIANT)),wpad, \ @@ -53,11 +53,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI include $(INCLUDE_DIR)/package.mk -ifneq ($(CONFIG_PACKAGE_kmod-rt2800-lib),) - HOSTAPD_IEEE80211N:=y -endif - -ifneq ($(CONFIG_PACKAGE_kmod-ath9k),) +ifneq ($(CONFIG_DRIVER_11N_SUPPORT),) HOSTAPD_IEEE80211N:=y endif diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 7eb01f0ed..eaea21396 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -274,7 +274,7 @@ endef define KernelPackage/rt2800-lib $(call KernelPackage/rt2x00/Default) - DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +USB_SUPPORT:kmod-rt2x00-usb +TARGET_ramips:kmod-rt2x00-soc + DEPENDS+= @(PCI_SUPPORT||USB_SUPPORT||TARGET_ramips) +kmod-rt2x00-lib +USB_SUPPORT:kmod-rt2x00-usb +TARGET_ramips:kmod-rt2x00-soc +@DRIVER_11N_SUPPORT TITLE+= (rt2800 LIB) FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2800lib.ko AUTOLOAD:=$(call AutoLoad,27,rt2800lib) @@ -431,7 +431,7 @@ define KernelPackage/ath9k-common $(call KernelPackage/mac80211/Default) TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) URL:=http://linuxwireless.org/en/users/Drivers/ath9k - DEPENDS+= @PCI_SUPPORT +kmod-ath + DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT FILES:= \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_hw.ko @@ -496,7 +496,7 @@ endef define KernelPackage/carl9170 $(call KernelPackage/mac80211/Default) TITLE:=Driver for Atheros AR9170 USB sticks - DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core + DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +@DRIVER_11N_SUPPORT FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko AUTOLOAD:=$(call AutoLoad,60,carl9170) endef |