diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-10 20:13:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 20:13:01 +0200 |
| commit | 31d06a863901715bfc2503e2312aeb03917360af (patch) | |
| tree | 1ac83c57eaa42033701b25e18fe2dd217499bb14 /data | |
| parent | f3d7e453236948ff590afd735903d1a7238cea5b (diff) | |
| parent | f47c2e5b800b8601997cde4a8ba162988cc9e930 (diff) | |
| download | vyos-1x-31d06a863901715bfc2503e2312aeb03917360af.tar.gz vyos-1x-31d06a863901715bfc2503e2312aeb03917360af.zip | |
Merge pull request #3440 from vyos/mergify/bp/sagitta/pr-3430
bridge: T6317: add dependency call for wireless interfaces (backport #3430)
Diffstat (limited to 'data')
| -rw-r--r-- | data/config-mode-dependencies/vyos-1x.json | 3 | ||||
| -rw-r--r-- | data/templates/wifi/hostapd.conf.j2 | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/data/config-mode-dependencies/vyos-1x.json b/data/config-mode-dependencies/vyos-1x.json index afe3dd838..13de434bd 100644 --- a/data/config-mode-dependencies/vyos-1x.json +++ b/data/config-mode-dependencies/vyos-1x.json @@ -11,7 +11,8 @@ "ethernet": ["interfaces_ethernet"] }, "interfaces_bridge": { - "vxlan": ["interfaces_vxlan"] + "vxlan": ["interfaces_vxlan"], + "wlan": ["interfaces_wireless"] }, "load_balancing_wan": { "conntrack": ["system_conntrack"] diff --git a/data/templates/wifi/hostapd.conf.j2 b/data/templates/wifi/hostapd.conf.j2 index 83009242b..769325b49 100644 --- a/data/templates/wifi/hostapd.conf.j2 +++ b/data/templates/wifi/hostapd.conf.j2 @@ -28,6 +28,12 @@ interface={{ ifname }} {% for bridge in is_bridge_member %} bridge={{ bridge }} {% endfor %} + +# WDS (4-address frame) mode with per-station virtual interfaces +# (only supported with driver=nl80211) +# This mode allows associated stations to use 4-address frames to allow layer 2 +# bridging to be used. +wds_sta=1 {% endif %} # Driver interface type (hostap/wired/none/nl80211/bsd); @@ -739,4 +745,3 @@ wmm_ac_vo_cwmin=2 wmm_ac_vo_cwmax=3 wmm_ac_vo_txop_limit=47 wmm_ac_vo_acm=0 - |