diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-09-11 12:07:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-11 12:07:17 +0100 |
| commit | eb9e562c28d2935a3823a5522983697cf76dad52 (patch) | |
| tree | a6f686883b4fa6c47d9ff849ffa2f89e2ce2fa0b /data | |
| parent | dc1da7cbd594630124211c515592e4b9cefae261 (diff) | |
| parent | 6b57f03333a62aba34f1f50ab0d2f67e8e4475ad (diff) | |
| download | vyos-1x-eb9e562c28d2935a3823a5522983697cf76dad52.tar.gz vyos-1x-eb9e562c28d2935a3823a5522983697cf76dad52.zip | |
Merge pull request #4044 from vyos/mergify/bp/sagitta/pr-4028
T6693: wireless: Enable WiFi-6 (802.11ax) for 2.4GHz AccessPoints (backport #4028)
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/wifi/hostapd.conf.j2 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/data/templates/wifi/hostapd.conf.j2 b/data/templates/wifi/hostapd.conf.j2 index 0459fbc69..5f3757216 100644 --- a/data/templates/wifi/hostapd.conf.j2 +++ b/data/templates/wifi/hostapd.conf.j2 @@ -46,7 +46,14 @@ hw_mode=a ieee80211h=1 ieee80211ac=1 {% elif mode is vyos_defined('ax') %} +{#{% if capabilities.ht is vyos_defined and capabilities.vht not vyos_defined %}#} +{% if capabilities.he.channel_set_width is vyos_defined('81') or capabilities.he.channel_set_width is vyos_defined('83') or capabilities.he.channel_set_width is vyos_defined('84') %} +{# This is almost certainly a 2.4GHz network #} +hw_mode=g +{% else %} +{# This is likely a 5GHz or 6GHz network #} hw_mode=a +{% endif %} ieee80211h=1 ieee80211ax=1 {% else %} @@ -202,7 +209,7 @@ require_he=1 {% else %} ieee80211n={{ '1' if 'n' in mode or 'ac' in mode or 'ax' in mode else '0' }} {% endif %} -{# HE (802.11ax 6GHz) #} +{# HE (802.11ax) #} {% if capabilities.he is vyos_defined and mode in 'ax' %} {# For now, hard-code power levels for indoor-only AP #} he_6ghz_reg_pwr_type=0 @@ -220,6 +227,9 @@ op_class={{ capabilities.he.channel_set_width }} {% if capabilities.he.bss_color is vyos_defined %} he_bss_color={{ capabilities.he.bss_color }} {% endif %} +{% if capabilities.he.coding_scheme is vyos_defined %} +he_basic_mcs_nss_set={{ capabilities.he.coding_scheme }} +{% endif %} he_6ghz_rx_ant_pat={{ '1' if capabilities.he.antenna_pattern_fixed is vyos_defined else '0' }} he_su_beamformer={{ '1' if capabilities.he.beamform.single_user_beamformer is vyos_defined else '0' }} he_su_beamformee={{ '1' if capabilities.he.beamform.single_user_beamformee is vyos_defined else '0' }} |