hostapd: fix up patches after the last commit
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
parent
da4be02fcd
commit
63c01ad025
|
@ -6,9 +6,9 @@
|
||||||
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
|
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
|
||||||
+ if (!bss->wds_bridge[0])
|
+ if (!bss->wds_bridge[0])
|
||||||
+ os_strlcpy(bss->wds_bridge, pos, sizeof(bss->wds_bridge));
|
+ 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) {
|
} 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
|
--- a/src/ap/ap_drv_ops.c
|
||||||
+++ b/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
|
@@ -340,8 +340,6 @@ int hostapd_set_wds_sta(struct hostapd_d
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/hostapd/config_file.c
|
--- a/hostapd/config_file.c
|
||||||
+++ b/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);
|
line, bss->max_num_sta, MAX_STA_COUNT);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
struct hapd_interfaces *interfaces = iface->interfaces;
|
struct hapd_interfaces *interfaces = iface->interfaces;
|
||||||
--- a/src/ap/beacon.c
|
--- a/src/ap/beacon.c
|
||||||
+++ b/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 &&
|
if (hapd->conf->no_probe_resp_if_max_sta &&
|
||||||
is_multicast_ether_addr(mgmt->da) &&
|
is_multicast_ether_addr(mgmt->da) &&
|
||||||
is_multicast_ether_addr(mgmt->bssid) &&
|
is_multicast_ether_addr(mgmt->bssid) &&
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/hostapd/config_file.c
|
--- a/hostapd/config_file.c
|
||||||
+++ b/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,
|
wpa_printf(MSG_INFO,
|
||||||
"Line %d: Obsolete peerkey parameter ignored", line);
|
"Line %d: Obsolete peerkey parameter ignored", line);
|
||||||
#ifdef CONFIG_IEEE80211R_AP
|
#ifdef CONFIG_IEEE80211R_AP
|
||||||
|
|
|
@ -55,10 +55,10 @@
|
||||||
"x_snoop: Failed to initialize L2 packet processing %s",
|
"x_snoop: Failed to initialize L2 packet processing %s",
|
||||||
--- a/hostapd/config_file.c
|
--- a/hostapd/config_file.c
|
||||||
+++ b/hostapd/config_file.c
|
+++ b/hostapd/config_file.c
|
||||||
@@ -2357,6 +2357,8 @@ static int hostapd_config_fill(struct ho
|
@@ -2359,6 +2359,8 @@ static int hostapd_config_fill(struct ho
|
||||||
sizeof(conf->bss[0]->iface));
|
|
||||||
} else if (os_strcmp(buf, "bridge") == 0) {
|
|
||||||
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
|
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) {
|
+ } else if (os_strcmp(buf, "snoop_iface") == 0) {
|
||||||
+ os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
|
+ os_strlcpy(bss->snoop_iface, pos, sizeof(bss->snoop_iface));
|
||||||
} else if (os_strcmp(buf, "vlan_bridge") == 0) {
|
} else if (os_strcmp(buf, "vlan_bridge") == 0) {
|
||||||
|
|
Loading…
Reference in New Issue