webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

hostapd: Update to development version

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2021-01-18 13:02:15 +00:00
parent 50f75f8806
commit 5b2fc5d65f
3 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/patches/hostapd/hostapd-2.9-noscan.patch
View File

@@ -1,10 +1,9 @@
diff U3 hostapd/config_file.c hostapd/config_file.c
--- a/hostapd/config_file.c Wed Aug 7 15:25:25 2019
+++ b/hostapd/config_file.c Fri Sep 20 17:36:33 2019
@@ -3411,6 +3411,10 @@
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -3493,6 +3493,10 @@ static int hostapd_config_fill(struct ho
if (bss->ocv && !bss->ieee80211w)
bss->ieee80211w = 1;
#endif /* CONFIG_OCV */
#ifdef CONFIG_IEEE80211N
+ } else if (os_strcmp(buf, "noscan") == 0) {
+ conf->noscan = atoi(pos);
+ } else if (os_strcmp(buf, "ht_coex") == 0) {
@@ -12,10 +11,9 @@ diff U3 hostapd/config_file.c hostapd/config_file.c
} else if (os_strcmp(buf, "ieee80211n") == 0) {
conf->ieee80211n = atoi(pos);
} else if (os_strcmp(buf, "ht_capab") == 0) {
diff U3 src/ap/ap_config.h src/ap/ap_config.h
--- a/src/ap/ap_config.h Wed Aug 7 15:25:25 2019
+++ b/src/ap/ap_config.h Fri Sep 20 17:38:06 2019
@@ -932,6 +932,8 @@
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -984,6 +984,8 @@ struct hostapd_config {
int ht_op_mode_fixed;
u16 ht_capab;
@@ -24,10 +22,9 @@ diff U3 src/ap/ap_config.h src/ap/ap_config.h
int ieee80211n;
int secondary_channel;
int no_pri_sec_switch;
diff U3 src/ap/hw_features.c src/ap/hw_features.c
--- a/src/ap/hw_features.c Wed Aug 7 15:25:25 2019
+++ b/src/ap/hw_features.c Fri Sep 20 17:39:02 2019
@@ -477,7 +477,8 @@
--- a/src/ap/hw_features.c
+++ b/src/ap/hw_features.c
@@ -500,7 +500,8 @@ static int ieee80211n_check_40mhz(struct
int ret;
/* Check that HT40 is used and PRI / SEC switch is allowed */
@@ -37,10 +34,9 @@ diff U3 src/ap/hw_features.c src/ap/hw_features.c
return 0;
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c
--- a/src/ap/ieee802_11_ht.c Wed Aug 7 15:25:25 2019
+++ b/src/ap/ieee802_11_ht.c Fri Sep 20 17:41:24 2019
@@ -252,6 +252,9 @@
--- a/src/ap/ieee802_11_ht.c
+++ b/src/ap/ieee802_11_ht.c
@@ -230,6 +230,9 @@ void hostapd_2040_coex_action(struct hos
return;
}
@@ -50,13 +46,13 @@ diff U3 src/ap/ieee802_11_ht.c src/ap/ieee802_11_ht.c
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
wpa_printf(MSG_DEBUG,
"Ignore too short 20/40 BSS Coexistence Management frame");
@@ -410,6 +413,9 @@
void ht40_intolerant_add(struct hostapd_iface *iface, struct sta_info *sta)
{
@@ -390,6 +393,9 @@ void ht40_intolerant_add(struct hostapd_
if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
+ return;
+
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
return;
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
+ return;
+
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
" in Association Request", MAC2STR(sta->addr));