summaryrefslogtreecommitdiff
path: root/data/templates
diff options
context:
space:
mode:
authoralainlamar <alainlamar@users.noreply.github.com>2020-04-05 18:19:23 +0200
committerGitHub <noreply@github.com>2020-04-05 18:19:23 +0200
commit7b56a45fe866f62e47c04e1dabb32b1240297ed6 (patch)
tree06d9edcbf814f7eea13360c2cf74872472c0fe1c /data/templates
parent9b98256339f35ff5de346b08fb1573429a0801f8 (diff)
downloadvyos-1x-7b56a45fe866f62e47c04e1dabb32b1240297ed6.tar.gz
vyos-1x-7b56a45fe866f62e47c04e1dabb32b1240297ed6.zip
wireless: T2212: bugfix for BF-ANTENNA and SOUNDING-DIMENSION flags
VHT flags deal with many variables which depend on antenna count and supported features. BF-ANTENNA-(2|3|4) and SOUNDING-DIMENSION-(2|3|4) were not dealt with correctly. IEEE 802.11ac (VHT) supports at least 1 antenna and up to 8 antennas at most. The hsotapd VHT flags may support as many but most do not. Therefore, we need to be picky here...
Diffstat (limited to 'data/templates')
-rw-r--r--data/templates/wifi/hostapd.conf.tmpl14
1 files changed, 13 insertions, 1 deletions
diff --git a/data/templates/wifi/hostapd.conf.tmpl b/data/templates/wifi/hostapd.conf.tmpl
index bd2132b27..2884110d4 100644
--- a/data/templates/wifi/hostapd.conf.tmpl
+++ b/data/templates/wifi/hostapd.conf.tmpl
@@ -391,14 +391,26 @@ vht_capab=
{%- endif -%}
{%- if cap_vht_antenna_cnt -%}
+{%- if cap_vht_antenna_cnt|int > 1 -%}
+{%- if cap_vht_beamform -%}
{%- for beamform in cap_vht_beamform -%}
{%- if 'single-user-beamformer' in beamform -%}
+{%- if cap_vht_antenna_cnt|int < 6 -%}
[BF-ANTENNA-{{ cap_vht_antenna_cnt|int -1 }}][SOUNDING-DIMENSION-{{ cap_vht_antenna_cnt|int -1}}]
+{%- endif -%}
{%- else -%}
+{%- if cap_vht_antenna_cnt|int < 5 -%}
[BF-ANTENNA-{{ cap_vht_antenna_cnt }}][SOUNDING-DIMENSION-{{ cap_vht_antenna_cnt }}]
{%- endif -%}
+{%- endif -%}
{%- endfor -%}
-{%- endif %}
+{%- else -%}
+{%- if cap_vht_antenna_cnt|int < 5 -%}
+[BF-ANTENNA-{{ cap_vht_antenna_cnt }}][SOUNDING-DIMENSION-{{ cap_vht_antenna_cnt }}]
+{%- endif -%}
+{%- endif -%}
+{%- endif -%}
+{%- endif -%}
# ieee80211n: Whether IEEE 802.11n (HT) is enabled
# 0 = disabled (default)