ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-02 01:08:05 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

hostapd: fix bringing up vlan interfaces with the no-bridge option

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: maurerr <mariusd84@gmail.com>
This commit is contained in:
Felix Fietkau 2021-06-03 15:21:00 +02:00 committed by maurerr
parent 452a1d6113
commit ff020e05ee
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
package/network/services/hostapd/patches/710-vlan_no_bridge.patch
View File

@ -10,16 +10,24 @@
#define DYNAMIC_VLAN_NAMING_END 2 #define DYNAMIC_VLAN_NAMING_END 2
--- a/src/ap/vlan_full.c --- a/src/ap/vlan_full.c
+++ b/src/ap/vlan_full.c +++ b/src/ap/vlan_full.c
@@ -466,6 +466,9 @@ void vlan_newlink(const char *ifname, st @@ -475,6 +475,9 @@ void vlan_newlink(const char *ifname, st
if (!vlan)
wpa_printf(MSG_DEBUG, "VLAN: vlan_newlink(%s)", ifname); return;
+ if (hapd->conf->ssid.vlan_no_bridge) + if (hapd->conf->ssid.vlan_no_bridge)
+ return; + goto out;
+ +
for (vlan = hapd->conf->vlan; vlan; vlan = vlan->next) { vlan->configured = 1;
if (vlan->configured ||
os_strcmp(ifname, vlan->ifname) != 0) 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 --- a/hostapd/config_file.c
+++ b/hostapd/config_file.c +++ b/hostapd/config_file.c
@@ -3366,6 +3366,8 @@ static int hostapd_config_fill(struct ho @@ -3366,6 +3366,8 @@ static int hostapd_config_fill(struct ho