hostapd: fix up patches after the last commit

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/package/network/services/hostapd/patches/711-wds_bridge_force.patch b/package/network/services/hostapd/patches/711-wds_bridge_force.patch
index 1d4848976b26611179b6c927232f286ffc6951f7..d3f8864a7490d38535ca705437b5f21976784860 100644 (file)
--- a/package/network/services/hostapd/patches/711-wds_bridge_force.patch
+++ b/package/network/services/hostapd/patches/711-wds_bridge_force.patch
@@ -6,9 +6,9 @@
                os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
 +              if (!bss->wds_bridge[0])
 +                      os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
-       } else if (os_strcmp(buf, "snoop_iface") == 0) {
-               os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
        } else if (os_strcmp(buf, "vlan_bridge") == 0) {
+               os_strlcpy(bss->vlan_bridge, pos, sizeof(bss->vlan_bridge));
+       } else if (os_strcmp(buf, "wds_bridge") == 0) {
 --- a/src/ap/ap_drv_ops.c
 +++ b/src/ap/ap_drv_ops.c
 @@ -340,8 +340,6 @@ int hostapd_set_wds_sta(struct hostapd_d

diff --git a/package/network/services/hostapd/patches/720-iface_max_num_sta.patch b/package/network/services/hostapd/patches/720-iface_max_num_sta.patch
index e46c1f1a2ca37a28e627505528dc38d16647a8dc..72503b1aad0a276ec66d0edafb127a35789c69af 100644 (file)
--- a/package/network/services/hostapd/patches/720-iface_max_num_sta.patch
+++ b/package/network/services/hostapd/patches/720-iface_max_num_sta.patch
@@ -1,6 +1,6 @@
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -2873,6 +2873,14 @@ static int hostapd_config_fill(struct ho
+@@ -2875,6 +2875,14 @@ static int hostapd_config_fill(struct ho
                                   line, bss->max_num_sta, MAX_STA_COUNT);
                        return 1;
                }
@@ -60,7 +60,7 @@
        struct hapd_interfaces *interfaces = iface->interfaces;
 --- a/src/ap/beacon.c
 +++ b/src/ap/beacon.c
-@@ -1042,7 +1042,7 @@ void handle_probe_req(struct hostapd_dat
+@@ -1039,7 +1039,7 @@ void handle_probe_req(struct hostapd_dat
        if (hapd->conf->no_probe_resp_if_max_sta &&
            is_multicast_ether_addr(mgmt->da) &&
            is_multicast_ether_addr(mgmt->bssid) &&

diff --git a/package/network/services/hostapd/patches/730-ft_iface.patch b/package/network/services/hostapd/patches/730-ft_iface.patch
index 793e8e01940e76dd5e325764aed2736c7c284c84..0a1a16d6e397dfc3c04b24c3333943fcc8cab560 100644 (file)
--- a/package/network/services/hostapd/patches/730-ft_iface.patch
+++ b/package/network/services/hostapd/patches/730-ft_iface.patch
@@ -1,6 +1,6 @@
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -3031,6 +3031,8 @@ static int hostapd_config_fill(struct ho
+@@ -3033,6 +3033,8 @@ static int hostapd_config_fill(struct ho
                wpa_printf(MSG_INFO,
                           "Line %d: Obsolete peerkey parameter ignored", line);
  #ifdef CONFIG_IEEE80211R_AP

diff --git a/package/network/services/hostapd/patches/740-snoop_iface.patch b/package/network/services/hostapd/patches/740-snoop_iface.patch
index 8d928f8505594309adad476ba7814f88610778b0..d206ed73229b0abbe3b13d8ad724fa940aa14e67 100644 (file)
--- a/package/network/services/hostapd/patches/740-snoop_iface.patch
+++ b/package/network/services/hostapd/patches/740-snoop_iface.patch
@@ -55,10 +55,10 @@
                           "x_snoop: Failed to initialize L2 packet processing %s",
 --- a/hostapd/config_file.c
 +++ b/hostapd/config_file.c
-@@ -2357,6 +2357,8 @@ static int hostapd_config_fill(struct ho
-                          sizeof(conf->bss[0]->iface));
-       } else if (os_strcmp(buf, "bridge") == 0) {
+@@ -2359,6 +2359,8 @@ static int hostapd_config_fill(struct ho
                os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
+               if (!bss->wds_bridge[0])
+                       os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
 +      } else if (os_strcmp(buf, "snoop_iface") == 0) {
 +              os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
        } else if (os_strcmp(buf, "vlan_bridge") == 0) {