hostapd: adjust patches to work with git am

[openwrt/staging/xback.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 1be3f89242304f13ca00e93258b38d0548e29a3f..d3f797ed35abf68c61d1c170fa933bfc24cce920 100644 (file)
--- a/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
+++ b/package/network/services/hostapd/patches/710-vlan_no_bridge.patch
@@ -1,3 +1,22 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Tue, 18 May 2021 12:50:17 +0200
+Subject: [PATCH] hostapd: add patch for disabling automatic bridging of vlan
+ interfaces
+
+netifd is responsible for handling that, except if the vlan bridge
+was provided by the config
+
+--- a/hostapd/config_file.c
++++ b/hostapd/config_file.c
+@@ -3559,6 +3559,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);
++      } else if (os_strcmp(buf, "vlan_no_bridge") == 0) {
++              bss->ssid.vlan_no_bridge = atoi(pos);
+       } else if (os_strcmp(buf, "per_sta_vif") == 0) {
+               bss->ssid.per_sta_vif = atoi(pos);
+       } else if (os_strcmp(buf, "vlan_file") == 0) {
 --- a/src/ap/ap_config.h
 +++ b/src/ap/ap_config.h
 @@ -121,6 +121,7 @@ struct hostapd_ssid {
@@ -28,14 +47,3 @@
        ifconfig_up(ifname);
  }
  
---- a/hostapd/config_file.c
-+++ b/hostapd/config_file.c
-@@ -3559,6 +3559,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);
-+      } else if (os_strcmp(buf, "vlan_no_bridge") == 0) {
-+              bss->ssid.vlan_no_bridge = atoi(pos);
-       } else if (os_strcmp(buf, "per_sta_vif") == 0) {
-               bss->ssid.per_sta_vif = atoi(pos);
-       } else if (os_strcmp(buf, "vlan_file") == 0) {