|
@@ -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
|
|
|
|
|
-
|
|
|
|
|
- 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)
|
|
+ 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
|
|
--- 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
|