Skip to content

[noup] zephyr: unguard wpa_cli_cmds of CONFIG_WPA_CLI #145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fengming-ye wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[noup] zephyr: unguard wpa_cli_cmds of CONFIG_WPA_CLI #145

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 0 additions & 19 deletions wpa_supplicant/wpa_cli_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,10 @@ static char ** wpa_cli_complete_set(const char *str, int pos)
return NULL;
}

#if CONFIG_AP || CONFIG_P2P || \
!defined(__ZEPHYR__) || (defined(__ZEPHYR__) && defined(CONFIG_WPA_CLI))
static void wpa_cli_msg_cb(char *msg, size_t len)
{
wpa_printf(MSG_INFO, "%s\n", msg);
}
#endif

#ifdef CONFIG_AP
static int wpa_cli_cmd_sta(struct wpa_ctrl *ctrl, int argc, char *argv[])
Expand Down Expand Up @@ -615,7 +612,6 @@ static int wpa_cli_cmd_update_beacon(struct wpa_ctrl *ctrl, int argc,
}
#endif /* CONFIG_AP */

#if !defined(__ZEPHYR__) || (defined(__ZEPHYR__) && defined(CONFIG_WPA_CLI))
static int wpa_cli_cmd_ifname(struct wpa_ctrl *ctrl, int argc, char *argv[])
{
return wpa_cli_cmd(ctrl, "IFNAME", 0, argc, argv);
Expand Down Expand Up @@ -862,9 +858,6 @@ static int wpa_cli_cmd_ft_ds(struct wpa_ctrl *ctrl, int argc, char *argv[])
return wpa_cli_cmd(ctrl, "FT_DS", 1, argc, argv);
}

#endif /* !__ZEPHYR__ || (__ZEPHYR__ && CONFIG_WPA_CLI) */

#if !defined(__ZEPHYR__) || defined(CONFIG_WPS)
static int wpa_cli_cmd_wps_pbc(struct wpa_ctrl *ctrl, int argc, char *argv[])
{
return wpa_cli_cmd(ctrl, "WPS_PBC", 0, argc, argv);
Expand Down Expand Up @@ -897,9 +890,6 @@ static int wpa_cli_cmd_wps_cancel(struct wpa_ctrl *ctrl, int argc,
{
return wpa_cli_cmd(ctrl, "WPS_CANCEL", 0, argc, argv);
}
#endif /* !__ZEPHYR__ || CONFIG_WPS */

#if !defined(__ZEPHYR__) || (defined(__ZEPHYR__) && defined(CONFIG_WPA_CLI))

#ifdef CONFIG_WPS_NFC

Expand Down Expand Up @@ -2943,9 +2933,6 @@ static int wpa_cli_cmd_dscp_query(struct wpa_ctrl *ctrl, int argc, char *argv[])
return wpa_cli_cmd(ctrl, "DSCP_QUERY", 1, argc, argv);
}

#endif /* !__ZEPHYR__ || (__ZEPHYR__ && CONFIG_WPA_CLI)*/


enum wpa_cli_cmd_flags {
cli_cmd_flag_none = 0x00,
cli_cmd_flag_sensitive = 0x01
Expand Down Expand Up @@ -3038,7 +3025,6 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {
cli_cmd_flag_none,
"= update Beacon frame contents"},
#endif /* CONFIG_AP */
#if !defined(__ZEPHYR__) || (defined(__ZEPHYR__) && defined(CONFIG_WPA_CLI))
{ "ifname", wpa_cli_cmd_ifname, NULL,
cli_cmd_flag_none,
"= get current interface name" },
Expand Down Expand Up @@ -3208,8 +3194,6 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {
{ "ft_ds", wpa_cli_cmd_ft_ds, wpa_cli_complete_bss,
cli_cmd_flag_none,
"<addr> = request over-the-DS FT with <addr>" },
#endif /* !__ZEPHYR__ || (__ZEPHYR__ && CONFIG_WPA_CLI) */
#if !defined(__ZEPHYR__) || defined(CONFIG_WPS)
{ "wps_pbc", wpa_cli_cmd_wps_pbc, NULL,
cli_cmd_flag_none,
"[BSSID] = start Wi-Fi Protected Setup: Push Button Configuration" },
Expand All @@ -3222,8 +3206,6 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {
"<PIN> = verify PIN checksum" },
{ "wps_cancel", wpa_cli_cmd_wps_cancel, NULL, cli_cmd_flag_none,
"Cancels the pending WPS operation" },
#endif /* !__ZEPHYR__ || CONFIG_WPS */
#if !defined(__ZEPHYR__) || (defined(__ZEPHYR__) && defined(CONFIG_WPA_CLI))
#ifdef CONFIG_WPS_NFC
{ "wps_nfc", wpa_cli_cmd_wps_nfc, wpa_cli_complete_bss,
cli_cmd_flag_none,
Expand Down Expand Up @@ -3653,7 +3635,6 @@ static const struct wpa_cli_cmd wpa_cli_commands[] = {
{ "dscp_query", wpa_cli_cmd_dscp_query, NULL,
cli_cmd_flag_none,
"wildcard/domain_name=<string> = Send DSCP Query" },
#endif /* !__ZEPHYR__ || (__ZEPHYR__ && CONFIG_WPA_CLI)*/
{ NULL, NULL, NULL, cli_cmd_flag_none, NULL }
};

Expand Down