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>
openwrt-18.06
Leon M. George 2018-01-10 17:20:22 +01:00 committed by Felix Fietkau
parent 594dbaa262
commit 3a6c3c9c1c
1 changed files with 3 additions and 6 deletions

View File

@ -82,14 +82,11 @@ detect_mac80211() {
ht_capab="" ht_capab=""
iw phy "$dev" info | grep -q 'Capabilities:' && htmode=HT20 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') iw phy "$dev" info | grep -q '5180 MHz' && {
cap_5ghz=$(iw phy "$dev" info | grep -c "Band 2") mode_band="a"
[ "$vht_cap" -gt 0 -a "$cap_5ghz" -gt 0 ] && {
mode_band="a";
channel="36" channel="36"
htmode="VHT80" iw phy "$dev" info | grep -q 'VHT Capabilities' && htmode="VHT80"
} }
[ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode" [ -n "$htmode" ] && ht_capab="set wireless.radio${devidx}.htmode=$htmode"