diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-11 20:36:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-11 20:36:26 +0200 |
| commit | 143d292209b6ebe24f90667f2d5edd0216151163 (patch) | |
| tree | 60a9d76824d31d138cbd3a9cb5286570bb6b5f20 | |
| parent | 7ae606605e2f86288e0c76f440872d9eb2fcc46c (diff) | |
| parent | 3f93be7ffa3361110fdc2ae839c1a197cc2d6ce2 (diff) | |
| download | vyos-1x-143d292209b6ebe24f90667f2d5edd0216151163.tar.gz vyos-1x-143d292209b6ebe24f90667f2d5edd0216151163.zip | |
Merge pull request #330 from alainlamar/T2213
wireless: T2213: bugfix: Use ieee80211n and ieee80211ac if require_vht not set
| -rw-r--r-- | data/templates/wifi/hostapd.conf.tmpl | 7 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-wireless.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/data/templates/wifi/hostapd.conf.tmpl b/data/templates/wifi/hostapd.conf.tmpl index 031fb6c90..e2fb9ca8f 100644 --- a/data/templates/wifi/hostapd.conf.tmpl +++ b/data/templates/wifi/hostapd.conf.tmpl @@ -73,7 +73,6 @@ channel={{ channel }} # offloaded ACS is used. {% if 'n' in mode -%} hw_mode=g -ieee80211n=1 {% elif 'ac' in mode -%} hw_mode=a ieee80211h=1 @@ -421,6 +420,12 @@ vht_capab= ieee80211n=0 # Require stations to support VHT PHY (reject association if they do not) require_vht=1 +{% else -%} +{% if 'n' in mode or 'ac' in mode -%} +ieee80211n=1 +{% else -%} +ieee80211n=0 +{%- endif %} {% endif %} {% if cap_vht_center_freq_1 -%} diff --git a/src/conf_mode/interfaces-wireless.py b/src/conf_mode/interfaces-wireless.py index 07c4537b4..98bb9bafc 100755 --- a/src/conf_mode/interfaces-wireless.py +++ b/src/conf_mode/interfaces-wireless.py @@ -570,6 +570,9 @@ def verify(wifi): if not wifi['phy']: raise ConfigError('You must specify physical-device') + if not wifi['mode']: + raise ConfigError('You must specify a WiFi mode') + if wifi['op_mode'] == 'ap': c = Config() if not c.exists('system wifi-regulatory-domain'): |