From 3c03131f6caa3e1abd11bb91d0ce972bd37d9239 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Tue, 3 Nov 2020 17:12:25 +0100 Subject: ifconfig: T2985: fix wireless-bridge creation --- data/templates/wifi/hostapd.conf.tmpl | 5 ++++- python/vyos/ifconfig/bridge.py | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/data/templates/wifi/hostapd.conf.tmpl b/data/templates/wifi/hostapd.conf.tmpl index c5e4240d1..ba1453583 100644 --- a/data/templates/wifi/hostapd.conf.tmpl +++ b/data/templates/wifi/hostapd.conf.tmpl @@ -23,7 +23,10 @@ interface={{ ifname }} # added to the bridge automatically (brctl may refuse to do this before hostapd # has been started to change the interface mode). If needed, the bridge # interface is also created. -bridge={{ is_bridge_member }} +{# as there can only be one bridge interface it is save to loop #} +{% for bridge in is_bridge_member %} +bridge={{ bridge }} +{% endfor %} {% endif %} # Driver interface type (hostap/wired/none/nl80211/bsd); diff --git a/python/vyos/ifconfig/bridge.py b/python/vyos/ifconfig/bridge.py index f7388b298..bd43d4874 100644 --- a/python/vyos/ifconfig/bridge.py +++ b/python/vyos/ifconfig/bridge.py @@ -177,6 +177,10 @@ class BridgeIf(Interface): >>> BridgeIf('br0').add_port('eth0') >>> BridgeIf('br0').add_port('eth1') """ + # Bridge port handling of wireless interfaces is done by hostapd. + if 'wlan' in interface: + return + return self.set_interface('add_port', interface) def del_port(self, interface): -- cgit v1.2.3