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>
62 lines
2.1 KiB
Diff
62 lines
2.1 KiB
Diff
From: Felix Fietkau <nbd@openwrt.org>
|
|
Date: Thu, 13 Sep 2012 12:39:14 +0000
|
|
Subject: [PATCH] hostapd: support wps in hostapd_cli even when built from the
|
|
mini variant
|
|
|
|
--- a/hostapd/hostapd_cli.c
|
|
+++ b/hostapd/hostapd_cli.c
|
|
@@ -409,7 +409,6 @@ static int hostapd_cli_cmd_disassociate(
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_TAXONOMY
|
|
static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
|
|
char *argv[])
|
|
{
|
|
@@ -422,7 +421,6 @@ static int hostapd_cli_cmd_signature(str
|
|
os_snprintf(buf, sizeof(buf), "SIGNATURE %s", argv[0]);
|
|
return wpa_ctrl_command(ctrl, buf);
|
|
}
|
|
-#endif /* CONFIG_TAXONOMY */
|
|
|
|
|
|
static int hostapd_cli_cmd_sa_query(struct wpa_ctrl *ctrl, int argc,
|
|
@@ -439,7 +437,6 @@ static int hostapd_cli_cmd_sa_query(stru
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_WPS
|
|
static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
|
|
char *argv[])
|
|
{
|
|
@@ -665,7 +662,6 @@ static int hostapd_cli_cmd_wps_config(st
|
|
ssid_hex, argv[1]);
|
|
return wpa_ctrl_command(ctrl, buf);
|
|
}
|
|
-#endif /* CONFIG_WPS */
|
|
|
|
|
|
static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
|
|
@@ -1715,13 +1711,10 @@ static const struct hostapd_cli_cmd host
|
|
{ "disassociate", hostapd_cli_cmd_disassociate,
|
|
hostapd_complete_stations,
|
|
"<addr> = disassociate a station" },
|
|
-#ifdef CONFIG_TAXONOMY
|
|
{ "signature", hostapd_cli_cmd_signature, hostapd_complete_stations,
|
|
"<addr> = get taxonomy signature for a station" },
|
|
-#endif /* CONFIG_TAXONOMY */
|
|
{ "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
|
|
"<addr> = send SA Query to a station" },
|
|
-#ifdef CONFIG_WPS
|
|
{ "wps_pin", hostapd_cli_cmd_wps_pin, NULL,
|
|
"<uuid> <pin> [timeout] [addr] = add WPS Enrollee PIN" },
|
|
{ "wps_check_pin", hostapd_cli_cmd_wps_check_pin, NULL,
|
|
@@ -1746,7 +1739,6 @@ static const struct hostapd_cli_cmd host
|
|
"<SSID> <auth> <encr> <key> = configure AP" },
|
|
{ "wps_get_status", hostapd_cli_cmd_wps_get_status, NULL,
|
|
"= show current WPS status" },
|
|
-#endif /* CONFIG_WPS */
|
|
{ "disassoc_imminent", hostapd_cli_cmd_disassoc_imminent, NULL,
|
|
"= send Disassociation Imminent notification" },
|
|
{ "ess_disassoc", hostapd_cli_cmd_ess_disassoc, NULL,
|