From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 20 Mar 2015 11:47:16 +0000 (+0000)
Subject: mac80211: when looking for VHT, check 5GHz support as well
X-Git-Tag: reboot~3830
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8f91c80ea13abc5c66cee9f1b6d10d7b392dd16e;p=openwrt%2Fstaging%2Fblogic.git

mac80211: when looking for VHT, check 5GHz support as well

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 44906
---

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 589b0cb1bd07..d71417ec35ed 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2014 OpenWrt.org
+# Copyright (C) 2007-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=mac80211
 
 PKG_VERSION:=2015-03-09
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_BACKPORT_VERSION:=
 PKG_MD5SUM:=6d4b04e4ce8a1f54dabfb04f4709453c
diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index a7c4d2dbc2bc..ff0d467ab15e 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -86,7 +86,8 @@ detect_mac80211() {
 		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
 
 		vht_cap=$(iw phy "$dev" info | grep -c 'VHT Capabilities')
-		[ "$vht_cap" -gt 0 ] && {
+		5ghz_cap=$(iw phy "$dev" info | grep -c "Band 2")
+		[ "$vht_cap" -gt 0 -a "$5ghz_cap" -gt 0 ] && {
 			mode_band="a";
 			channel="36"
 			htmode="VHT80"