summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2020-04-04 19:55:32 +0200
committerGitHub <noreply@github.com>2020-04-04 19:55:32 +0200
commit71030ad38014f4884a48df43fc4bfd54a4fd497a (patch)
treec625fc9c609646834590e3924fe53c71c7e8da32
parenta1ae080499319b02a0f757125ca000c9db4c8fbb (diff)
parentdd94de1f5721a63dd0ed06060d0e3673fc1e80d7 (diff)
downloadvyos-1x-71030ad38014f4884a48df43fc4bfd54a4fd497a.tar.gz
vyos-1x-71030ad38014f4884a48df43fc4bfd54a4fd497a.zip
Merge pull request #301 from alainlamar/T2208
wireless: T2208: bugfix: errors in the XML and Python file
-rw-r--r--interface-definitions/interfaces-wireless.xml.in2
-rwxr-xr-xsrc/conf_mode/interfaces-wireless.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 12736510b..490e63a42 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -320,7 +320,7 @@
<properties>
<help>VHT link adaptation capabilities</help>
<completionHelp>
- <list>single-user-beamformer single-user-beamformee multi-user-beamformer multi-user-beamformee</list>
+ <list>unsolicited both</list>
</completionHelp>
<valueHelp>
<format>unsolicited</format>
diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py
index b6e62b0aa..9714e40e9 100755
--- a/src/conf_mode/interfaces-wireless.py
+++ b/src/conf_mode/interfaces-wireless.py
@@ -799,7 +799,7 @@ default_config_data = {
'cap_vht_center_freq_2' : '',
'cap_vht_chan_set_width' : '',
'cap_vht_ldpc' : False,
- 'cap_vht_link_adaptation' : False,
+ 'cap_vht_link_adaptation' : '',
'cap_vht_max_mpdu_exp' : '',
'cap_vht_max_mpdu' : '',
'cap_vht_short_gi' : [],
@@ -1043,7 +1043,7 @@ def get_config():
# VHT link adaptation capabilities
if conf.exists('capabilities vht link-adaptation'):
wifi['cap_vht'] = True
- wifi['cap_vht_link_adaptation'] = True
+ wifi['cap_vht_link_adaptation'] = conf.return_value('capabilities vht link-adaptation')
# Set the maximum length of A-MPDU pre-EOF padding that the station can receive
if conf.exists('capabilities vht max-mpdu-exp'):