diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-10 15:13:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 15:13:07 +0200 |
| commit | 8fa1cb497f8f4e16d95c1485897663220d86c18e (patch) | |
| tree | b923e0737d4aefefb1ea1c98123fbb54c0fab994 /data | |
| parent | 7925402b487b93d1ae8dd4941e0981437f7fb951 (diff) | |
| parent | 431443ab3f663a6617008536d2d6d96407aebfcb (diff) | |
| download | vyos-1x-8fa1cb497f8f4e16d95c1485897663220d86c18e.tar.gz vyos-1x-8fa1cb497f8f4e16d95c1485897663220d86c18e.zip | |
Merge pull request #3430 from c-po/bridge-T6317
bridge: T6317: add dependency call for wireless interfaces
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 - |