Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
hostapd: support wps in hostapd_cli even when built from the mini var…
…iant git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33393 3c298f89-4303-0410-b956-a3cf2f4a3e73
- Loading branch information
nbd
committed
Sep 13, 2012
1 parent
4de4955
commit c5bc738
Showing
1 changed file
with
50 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
--- a/hostapd/hostapd_cli.c | ||
+++ b/hostapd/hostapd_cli.c | ||
@@ -67,7 +67,6 @@ static const char *commands_help = | ||
#ifdef CONFIG_IEEE80211W | ||
" sa_query <addr> send SA Query to a station\n" | ||
#endif /* CONFIG_IEEE80211W */ | ||
-#ifdef CONFIG_WPS | ||
" wps_pin <uuid> <pin> [timeout] [addr] add WPS Enrollee PIN\n" | ||
" wps_check_pin <PIN> verify PIN checksum\n" | ||
" wps_pbc indicate button pushed to initiate PBC\n" | ||
@@ -82,7 +81,6 @@ static const char *commands_help = | ||
#endif /* CONFIG_WPS_NFC */ | ||
" wps_ap_pin <cmd> [params..] enable/disable AP PIN\n" | ||
" wps_config <SSID> <auth> <encr> <key> configure AP\n" | ||
-#endif /* CONFIG_WPS */ | ||
" get_config show current configuration\n" | ||
" help show this usage help\n" | ||
" interface [ifname] show interfaces/select interface\n" | ||
@@ -343,7 +341,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[]) | ||
{ | ||
@@ -573,7 +570,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_ess_disassoc(struct wpa_ctrl *ctrl, int argc, | ||
@@ -799,7 +795,6 @@ static struct hostapd_cli_cmd hostapd_cl | ||
#ifdef CONFIG_IEEE80211W | ||
{ "sa_query", hostapd_cli_cmd_sa_query }, | ||
#endif /* CONFIG_IEEE80211W */ | ||
-#ifdef CONFIG_WPS | ||
{ "wps_pin", hostapd_cli_cmd_wps_pin }, | ||
{ "wps_check_pin", hostapd_cli_cmd_wps_check_pin }, | ||
{ "wps_pbc", hostapd_cli_cmd_wps_pbc }, | ||
@@ -814,7 +809,6 @@ static struct hostapd_cli_cmd hostapd_cl | ||
#endif /* CONFIG_WPS_NFC */ | ||
{ "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin }, | ||
{ "wps_config", hostapd_cli_cmd_wps_config }, | ||
-#endif /* CONFIG_WPS */ | ||
{ "ess_disassoc", hostapd_cli_cmd_ess_disassoc }, | ||
{ "get_config", hostapd_cli_cmd_get_config }, | ||
{ "help", hostapd_cli_cmd_help }, |