From aeecc6ec124c9a4905fe8747d27693cc3968219b Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 25 Oct 2014 18:43:18 +0000 Subject: 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 SVN-Revision: 43063 --- package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh') 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 } -- cgit v1.2.3