da11a1e20c
Remove upstreamed from 2.11 release: 060-nl80211-fix-crash-when-adding-an-interface-fails.patch Rebase all other patches Signed-off-by: Ivan Pavlov <AuthorReflex@gmail.com> Link: https://github.com/openwrt/openwrt/pull/16338 Signed-off-by: Robert Marko <robimarko@gmail.com>
61 lines
2.1 KiB
Diff
61 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,
|
|
@@ -1694,13 +1690,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,
|
|
@@ -1725,7 +1718,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,
|