89f57d48f9
Add patch:
- 001-PASN-Fix-the-compilation-errors-without-CONFIG_PASN.patch
Manually edit patches:
- 110-mbedtls-TLS-crypto-option-initial-port.patch
- 190-hostapd-Fix-hostapd-crash-if-setup-a-iface-with-.patch
- 191-hostapd-add-support-for-specifying-the-link-id-in-th.patch
- 220-indicate-features.patch
- 360-acs_retry.patch
-> Remove the extra check for -EBUSY (see below) because the code we
want to skip is now already guarded by:
https://git.w1.fi/cgit/hostap/commit/?id=af6473761f07ae4f13ef228dec618ca62faf6ef4
```
+ if (ret == -EBUSY)
+ goto fail;
```
- 341-mesh-ctrl-iface-channel-switch.patch
- 600-ubus_support.patch
- 601-ucode_support.patch
-> The patch had this and similar changes:
```
- if (os_strcmp(drv->first_bss->ifname, ifname) != 0) {
+ if (drv->first_bss->ifindex != ifi->ifi_index) {
```
Those changes should be unnecessary due to the commit:
https://git.w1.fi/cgit/hostap/commit/?id=2bf6d85963b9857b411b57cc7949e30ee2cb1216
- 780-Implement-APuP-Access-Point-Micro-Peering.patch
-> Needs adjustement because of Enhanced Privacy Protection (EPP):
https://git.w1.fi/cgit/hostap/commit/?id=1e13ee9c382a5d88c4bb0ffdfaf434fbb31123f3
Remove patch:
- 030-Revert-nl80211-Accept-a-global-nl80211-event-to-a-br.patch
- 060-nl80211-fix-reporting-spurious-frame-events.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=ca266cc24d8705eb1a2a0857ad326e48b1408b20
- 190-hostapd-Fix-hostapd-crash-if-setup-a-iface-with-.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=e275c3dc70e1c2947e02e43aeee6c4f9975c3dc7
- 192-nl80211-cancel-scans-whenever-the-first-bss-is-remov.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=5ce1d41803866782bbd96d575f53d43358a20a2e
- 350-nl80211_del_beacon_bss.patch
-> https://git.w1.fi/cgit/hostap/commit/?id=b777ecb16274235974edb5c1dfcea6abab25f6c4
Tested-By: Daniel Pawlik <pawlik.dan@gmail.com>
Co-developed-by: Agustin Lorenzo <agustin.lorenzo@thinco.es>
Link: https://github.com/openwrt/openwrt/pull/20912
Signed-off-by: Nick Hainke <vincent@systemli.org>
64 lines
2.0 KiB
Diff
64 lines
2.0 KiB
Diff
From c61daab867671af884a7bb707f9bc0f086241bcd Mon Sep 17 00:00:00 2001
|
|
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Wed, 20 Jan 2010 02:26:00 +0000
|
|
Subject: [PATCH] Add noscan, no_ht_coex config options
|
|
|
|
--- a/hostapd/config_file.c
|
|
+++ b/hostapd/config_file.c
|
|
@@ -3530,6 +3530,10 @@ static int hostapd_config_fill(struct ho
|
|
if (bss->ocv && !bss->ieee80211w)
|
|
bss->ieee80211w = 1;
|
|
#endif /* CONFIG_OCV */
|
|
+ } else if (os_strcmp(buf, "noscan") == 0) {
|
|
+ conf->noscan = atoi(pos);
|
|
+ } else if (os_strcmp(buf, "ht_coex") == 0) {
|
|
+ conf->no_ht_coex = !atoi(pos);
|
|
} else if (os_strcmp(buf, "ieee80211n") == 0) {
|
|
conf->ieee80211n = atoi(pos);
|
|
} else if (os_strcmp(buf, "ht_capab") == 0) {
|
|
--- a/src/ap/ap_config.h
|
|
+++ b/src/ap/ap_config.h
|
|
@@ -1119,6 +1119,8 @@ struct hostapd_config {
|
|
|
|
int ht_op_mode_fixed;
|
|
u16 ht_capab;
|
|
+ int noscan;
|
|
+ int no_ht_coex;
|
|
int ieee80211n;
|
|
int secondary_channel;
|
|
int no_pri_sec_switch;
|
|
--- a/src/ap/hw_features.c
|
|
+++ b/src/ap/hw_features.c
|
|
@@ -619,7 +619,8 @@ static int ieee80211n_check_40mhz(struct
|
|
int ret;
|
|
|
|
/* Check that HT40 is used and PRI / SEC switch is allowed */
|
|
- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
|
|
+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
|
|
+ iface->conf->noscan)
|
|
return 0;
|
|
|
|
hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
|
|
--- a/src/ap/ieee802_11_ht.c
|
|
+++ b/src/ap/ieee802_11_ht.c
|
|
@@ -279,6 +279,9 @@ void hostapd_2040_coex_action(struct hos
|
|
return;
|
|
}
|
|
|
|
+ if (iface->conf->noscan || iface->conf->no_ht_coex)
|
|
+ return;
|
|
+
|
|
if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie)) {
|
|
wpa_printf(MSG_DEBUG,
|
|
"Ignore too short 20/40 BSS Coexistence Management frame");
|
|
@@ -439,6 +442,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;
|
|
+
|
|
wpa_printf(MSG_INFO, "HT: Forty MHz Intolerant is set by STA " MACSTR
|
|
" in Association Request", MAC2STR(sta->addr));
|
|
|