From 31737597c424793eee03f92fa76908b1251d3724 Mon Sep 17 00:00:00 2001 From: Alain Lamar Date: Sat, 4 Apr 2020 18:48:43 +0200 Subject: wireless: T2211: bugfix: vht_oper_chwidth was not set in hostapd config When operating in certain modes, channel width must be configured for WiFi interfaces. The hostapd config does this in two separate lines which must both be configured: vht_oper_chwidth=(0|1|2|3) vht_capab+=[VHT160] for 160MHz in one block or vht_capab+=[VHT160-80PLUS80] for 160MHz as 2x 80MHz in two separate blocks. --- src/conf_mode/interfaces-wireless.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/conf_mode') diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index b6e62b0aa..3d62897aa 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -239,6 +239,10 @@ uapsd_advertisement_enabled=1 require_ht=1 {% endif %} +{%- if cap_vht_chan_set_width -%} +vht_oper_chwidth={{ cap_vht_chan_set_width }} +{%- endif -%} + # vht_capab: VHT capabilities (list of flags) # # vht_max_mpdu_len: [MAX-MPDU-7991] [MAX-MPDU-11454] @@ -368,10 +372,6 @@ vht_capab= [MAX-A-MPDU-LEN-EXP{{ cap_vht_max_mpdu_exp }}] {%- endif -%} -{%- if cap_vht_chan_set_width -%} -[MAX-A-MPDU-LEN-EXP{{ cap_vht_max_mpdu_exp }}] -{%- endif -%} - {%- if cap_vht_chan_set_width -%} {%- if '2' in cap_vht_chan_set_width -%} [VHT160] @@ -797,7 +797,7 @@ default_config_data = { 'cap_vht_beamform' : '', 'cap_vht_center_freq_1' : '', 'cap_vht_center_freq_2' : '', - 'cap_vht_chan_set_width' : '', + 'cap_vht_chan_set_width' : '0', 'cap_vht_ldpc' : False, 'cap_vht_link_adaptation' : False, 'cap_vht_max_mpdu_exp' : '', -- cgit v1.2.3 From c3b3f6fe1242b5774eccfa70e3e9c4736e4ab5d1 Mon Sep 17 00:00:00 2001 From: Alain Lamar Date: Sat, 4 Apr 2020 19:01:28 +0200 Subject: wireless: T2211: bugfix: Bugfix for the bugfix: set no defaults When any defaults are set, VHT capabilities are automatically assumed for all WiFi modes which does not match the reality. Therefore we must leave this undefined by default. --- src/conf_mode/interfaces-wireless.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/conf_mode') diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index 3d62897aa..f7ecb098e 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -797,7 +797,7 @@ default_config_data = { 'cap_vht_beamform' : '', 'cap_vht_center_freq_1' : '', 'cap_vht_center_freq_2' : '', - 'cap_vht_chan_set_width' : '0', + 'cap_vht_chan_set_width' : '', 'cap_vht_ldpc' : False, 'cap_vht_link_adaptation' : False, 'cap_vht_max_mpdu_exp' : '', -- cgit v1.2.3