From: Leon M. George <leon@georgemail.eu>
Date: Wed, 10 Jan 2018 16:20:22 +0000 (+0100)
Subject: mac80211: join 5GHz checks
X-Git-Tag: v18.06.0-rc1~366
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3a6c3c9c1c556fd53a4f650be2fbf5783ead1b88;p=openwrt%2Fstaging%2Fpepe2k.git

mac80211: join 5GHz checks

Before this commit, devices supporting both 2.4GHz and 5GHz would be
configured for 2.4GHz by default - unless they have VHT capabilities.

With this commit, channel 36 is only set when the frequency is supported.
VHT isn't checked unless that is the case.

Signed-off-by: Leon M. George <leon@georgemail.eu>
---

diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
index 354077733e..511a9188db 100644
--- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
@@ -82,14 +82,11 @@ detect_mac80211() {
 		ht_capab=""
 
 		iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT20
-		iw phy "$dev" info | grep -q '2412 MHz' || { mode_band="a"; channel="36"; }
 
-		vht_cap=$(iw phy "$dev" info | grep -c 'VHT Capabilities')
-		cap_5ghz=$(iw phy "$dev" info | grep -c "Band 2")
-		[ "$vht_cap" -gt 0 -a "$cap_5ghz" -gt 0 ] && {
-			mode_band="a";
+		iw phy "$dev" info | grep -q '5180 MHz' && {
+			mode_band="a"
 			channel="36"
-			htmode="VHT80"
+			iw phy "$dev" info | grep -q 'VHT Capabilities' && htmode="VHT80"
 		}
 
 		[ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode"