8af79550e6
This also syncs the configuration files with the default configuration files, but no extra options are activated or deactivated. The mesh patches were partially merged into hostapd 2.8, the remaining patches were extracted from patchwork and are now applied by OpenWrt. The patches still have open questions which are not fixed by the author. They were taken from this page: https://patchwork.ozlabs.org/project/hostap/list/?series=62725&state=* The changes in 007-mesh-apply-channel-attributes-before-running-Mesh.patch where first applied to hostapd, but later reverted in hostapd commit 3e949655ccc5 because they caused memory leaks. The size of the ipkgs increase a bit (between 1.3% and 2.3%): old 2018-12-02 (2.7): 283337 wpad-basic_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk 252857 wpad-mini_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk 417473 wpad-openssl_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk 415105 wpad-wolfssl_2018-12-02-c2c6c01b-11_mipsel_24kc.ipk new 2019-04-21 (2.8): 288264 wpad-basic_2019-04-21-63962824-1_mipsel_24kc.ipk 256188 wpad-mini_2019-04-21-63962824-1_mipsel_24kc.ipk 427475 wpad-openssl_2019-04-21-63962824-1_mipsel_24kc.ipk 423071 wpad-wolfssl_2019-04-21-63962824-1_mipsel_24kc.ipk Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
58 lines
2 KiB
Diff
58 lines
2 KiB
Diff
--- a/hostapd/hostapd_cli.c
|
|
+++ b/hostapd/hostapd_cli.c
|
|
@@ -385,7 +385,6 @@ static int hostapd_cli_cmd_disassociate(
|
|
}
|
|
|
|
|
|
-#ifdef CONFIG_TAXONOMY
|
|
static int hostapd_cli_cmd_signature(struct wpa_ctrl *ctrl, int argc,
|
|
char *argv[])
|
|
{
|
|
@@ -398,7 +397,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 */
|
|
|
|
|
|
#ifdef CONFIG_IEEE80211W
|
|
@@ -417,7 +415,6 @@ static int hostapd_cli_cmd_sa_query(stru
|
|
#endif /* CONFIG_IEEE80211W */
|
|
|
|
|
|
-#ifdef CONFIG_WPS
|
|
static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
|
|
char *argv[])
|
|
{
|
|
@@ -643,7 +640,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,
|
|
@@ -1531,15 +1527,12 @@ 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 */
|
|
#ifdef CONFIG_IEEE80211W
|
|
{ "sa_query", hostapd_cli_cmd_sa_query, hostapd_complete_stations,
|
|
"<addr> = send SA Query to a station" },
|
|
#endif /* CONFIG_IEEE80211W */
|
|
-#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,
|
|
@@ -1564,7 +1557,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,
|