hostapd: refresh patches

[openwrt/staging/wigyori.git] / package / network / services / hostapd / patches / 710-vlan_no_bridge.patch

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 7de4e2c1d4231428babe6c95dd0478c754d7f91c..856dc8ba88901bc01072045680b2511576084e79 100644 (file)
--- a/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
+++ b/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
@@ -10,19 +10,27 @@
  #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
-@@ -3400,6 +3400,8 @@ static int hostapd_config_fill(struct ho
+@@ -3381,6 +3381,8 @@ static int hostapd_config_fill(struct ho
  #ifndef CONFIG_NO_VLAN
        } else if (os_strcmp(buf, "dynamic_vlan") == 0) {
                bss->ssid.dynamic_vlan = atoi(pos);