aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2014-10-25 18:43:18 +0000
committerJo-Philipp Wich <jow@openwrt.org>2014-10-25 18:43:18 +0000
commitaeecc6ec124c9a4905fe8747d27693cc3968219b (patch)
treedd170222b10fecd57310ca2fbc53150d214961bd
parent7a5002ec9d67515cbeea99a89b94c70dc50456c4 (diff)
downloadupstream-aeecc6ec124c9a4905fe8747d27693cc3968219b.tar.gz
upstream-aeecc6ec124c9a4905fe8747d27693cc3968219b.tar.bz2
upstream-aeecc6ec124c9a4905fe8747d27693cc3968219b.zip
broadcom-wl: align with mac80211 config
- Support HT40 instead of HT40+/HT40- like mac80211 - Enable 11n if htmode is HT20 or HT40 Signed-off-by: Jo-Philipp Wich <jow@openwrt.org> SVN-Revision: 43063
-rw-r--r--package/kernel/broadcom-wl/Makefile4
-rw-r--r--package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh17
2 files changed, 15 insertions, 6 deletions
diff --git a/package/kernel/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile
index d790d2c3a4..29137e0dc0 100644
--- a/package/kernel/broadcom-wl/Makefile
+++ b/package/kernel/broadcom-wl/Makefile
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2006-2012 OpenWrt.org
+# Copyright (C) 2006-2014 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=broadcom-wl
PKG_VERSION:=5.10.56.27.3
-PKG_RELEASE:=7
+PKG_RELEASE:=8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(ARCH).tar.bz2
PKG_SOURCE_URL:=http://downloads.openwrt.org/sources
diff --git a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
index 69e3132967..65179a5692 100644
--- a/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -199,11 +199,20 @@ enable_broadcom() {
}
# Use 'chanspec' instead of 'channel' for 'N' modes (See bcmwifi.h)
- [ ${nmode:-0} -ne 0 -a -n "$band" -a -n "$channel" ] && {
+ [ -n "$nmode" -a -n "$band" -a -n "$channel" ] && {
case "$htmode" in
- HT40-) chanspec=$(printf 0x%x%x%02x $band 0xe $(($channel - 2))); channel=;;
- HT40+) chanspec=$(printf 0x%x%x%02x $band 0xd $(($channel + 2))); channel=;;
- HT20) chanspec=$(printf 0x%x%x%02x $band 0xb $channel); channel=;;
+ HT40)
+ if [ -n "$gmode" ]; then
+ [ $channel -lt 7 ] && htmode="HT40+" || htmode="HT40-"
+ else
+ [ $(( ($channel / 4) % 2 )) -eq 1 ] && htmode="HT40+" || htmode="HT40-"
+ fi
+ ;;
+ esac
+ case "$htmode" in
+ HT40-) chanspec=$(printf 0x%x%x%02x $band 0xe $(($channel - 2))); nmode=1; channel=;;
+ HT40+) chanspec=$(printf 0x%x%x%02x $band 0xd $(($channel + 2))); nmode=1; channel=;;
+ HT20) chanspec=$(printf 0x%x%x%02x $band 0xb $channel); nmode=1; channel=;;
*) ;;
esac
}