aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-09-30 15:00:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-09-30 15:00:06 +0000
commit2b21b320a9c5db37d4cd272c66de53133a5474e4 (patch)
tree05a72f6da603e083c08c5071194811dda85da215
parentcd3128399ace3a1dac9a2a77ba325d7f70a377df (diff)
downloadupstream-2b21b320a9c5db37d4cd272c66de53133a5474e4.tar.gz
upstream-2b21b320a9c5db37d4cd272c66de53133a5474e4.tar.bz2
upstream-2b21b320a9c5db37d4cd272c66de53133a5474e4.zip
ath9k: compile out the ath9k rate control
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23163 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/mac80211/Makefile13
-rw-r--r--package/mac80211/patches/017-remove_ath9k_rc.patch11
2 files changed, 11 insertions, 13 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 259f744ee5..f65a823bd8 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -24,7 +24,6 @@ PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-mac80211 \
CONFIG_PACKAGE_MAC80211_DEBUGFS \
- CONFIG_PACKAGE_ATH9K_USE_MINSTREL \
CONFIG_PACKAGE_ATH_DEBUG \
CONFIG_ATH_USER_REGD \
@@ -446,17 +445,6 @@ This module adds support for wireless adapters based on
Atheros IEEE 802.11n AR5008 and AR9001 family of chipsets.
endef
-define KernelPackage/ath9k/config
- menu "Configuration"
- depends PACKAGE_kmod-ath9k
-
- config PACKAGE_ATH9K_USE_MINSTREL
- bool "use the new minstrel_ht rate control for ath9k"
- default y
-
- endmenu
-endef
-
define KernelPackage/carl9170
$(call KernelPackage/mac80211/Default)
TITLE:=Driver for Atheros AR9170 USB sticks
@@ -837,7 +825,6 @@ BUILDFLAGS:= \
-D__CONFIG_MAC80211_RC_DEFAULT=minstrel \
-DCONFIG_MAC80211_RC_MINSTREL_HT \
$(if $(CONFIG_ATH_USER_REGD),-DATH_USER_REGD=1) \
- $(if $(CONFIG_PACKAGE_ATH9K_USE_MINSTREL),-DATH9K_USE_MINSTREL) \
$(if $(CONFIG_PACKAGE_RT2X00_LIB_DEBUGFS),-DCONFIG_RT2X00_LIB_DEBUGFS) \
$(if $(CONFIG_PACKAGE_RT2X00_DEBUG),-DCONFIG_RT2X00_DEBUG) \
$(if $(NEED_RT2X00_LIB_HT),-DCONFIG_RT2X00_LIB_HT) \
diff --git a/package/mac80211/patches/017-remove_ath9k_rc.patch b/package/mac80211/patches/017-remove_ath9k_rc.patch
new file mode 100644
index 0000000000..f9e8756d41
--- /dev/null
+++ b/package/mac80211/patches/017-remove_ath9k_rc.patch
@@ -0,0 +1,11 @@
+--- a/config.mk
++++ b/config.mk
+@@ -204,7 +204,7 @@ CONFIG_ATH9K_COMMON=m
+ # as default once we get minstrel properly tested and blessed by
+ # our systems engineering team. CCK rates also need to be used
+ # for long range considerations.
+-CONFIG_ATH9K_RATE_CONTROL=y
++# CONFIG_ATH9K_RATE_CONTROL=y
+
+
+ CONFIG_COMPAT_IWLWIFI=m