aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-06-03 15:21:00 +0200
committerFelix Fietkau <nbd@nbd.name>2021-06-04 20:36:42 +0200
commit89bd8607f8cdacea7e8d13c1233a2a8b13fdf64c (patch)
treeab3227ea1772cad9c4548b68cefbef40b385d3e5
parent55ded1c2658de67a235dca096266b77e7d5dc51f (diff)
downloadupstream-89bd8607f8cdacea7e8d13c1233a2a8b13fdf64c.tar.gz
upstream-89bd8607f8cdacea7e8d13c1233a2a8b13fdf64c.tar.bz2
upstream-89bd8607f8cdacea7e8d13c1233a2a8b13fdf64c.zip
hostapd: fix bringing up vlan interfaces with the no-bridge option
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/network/services/hostapd/patches/710-vlan_no_bridge.patch22
1 files changed, 15 insertions, 7 deletions
diff --git a/package/network/services/hostapd/patches/710-vlan_no_bridge.patch b/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
index d5aa33520b..73db32e54a 100644
--- a/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
+++ b/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
@@ -10,16 +10,24 @@
#define DYNAMIC_VLAN_NAMING_END 2
--- a/src/ap/vlan_full.c
+++ b/src/ap/vlan_full.c
-@@ -466,6 +466,9 @@ void vlan_newlink(const char *ifname, st
-
- wpa_printf(MSG_DEBUG, "VLAN: vlan_newlink(%s)", ifname);
+@@ -475,6 +475,9 @@ void vlan_newlink(const char *ifname, st
+ if (!vlan)
+ return;
+ if (hapd->conf->ssid.vlan_no_bridge)
-+ return;
++ goto out;
+
- for (vlan = hapd->conf->vlan; vlan; vlan = vlan->next) {
- if (vlan->configured ||
- os_strcmp(ifname, vlan->ifname) != 0)
+ vlan->configured = 1;
+
+ notempty = vlan->vlan_desc.notempty;
+@@ -506,6 +509,7 @@ void vlan_newlink(const char *ifname, st
+ ifname, br_name, tagged[i], hapd);
+ }
+
++out:
+ ifconfig_up(ifname);
+ }
+
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3366,6 +3366,8 @@ static int hostapd_config_fill(struct ho