michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: wifi: remove HAPD in Wi-Fi shell layer

Browse source 
For CMD 'wifi ap status', removing HAPD related definition to make it
more commonly used for non-supplicant case.

Signed-off-by: Maochen Wang <maochen.wang@nxp.com>
This commit is contained in:
Maochen Wang 2024-11-20 14:18:04 +08:00 • committed by Benjamin Cabé
commit 10d4de5237
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/zephyr/net/wifi_mgmt.h
View file

@ -1219,14 +1219,14 @@ struct wifi_wps_config_params {
/** Wi-Fi AP status /** Wi-Fi AP status
*/ */
enum wifi_hostapd_iface_state { enum wifi_sap_iface_state {
WIFI_HAPD_IFACE_UNINITIALIZED, WIFI_SAP_IFACE_UNINITIALIZED,
WIFI_HAPD_IFACE_DISABLED, WIFI_SAP_IFACE_DISABLED,
WIFI_HAPD_IFACE_COUNTRY_UPDATE, WIFI_SAP_IFACE_COUNTRY_UPDATE,
WIFI_HAPD_IFACE_ACS, WIFI_SAP_IFACE_ACS,
WIFI_HAPD_IFACE_HT_SCAN, WIFI_SAP_IFACE_HT_SCAN,
WIFI_HAPD_IFACE_DFS, WIFI_SAP_IFACE_DFS,
WIFI_HAPD_IFACE_ENABLED WIFI_SAP_IFACE_ENABLED
}; };
#include <zephyr/net/net_if.h> #include <zephyr/net/net_if.h>

27
subsys/net/l2/wifi/wifi_shell.c
View file

@ -1177,25 +1177,26 @@ static int cmd_wifi_ap_status(const struct shell *sh, size_t argc, char *argv[])
} }
switch (status.state) { switch (status.state) {
case WIFI_HAPD_IFACE_UNINITIALIZED: case WIFI_SAP_IFACE_UNINITIALIZED:
PR("State: %s\n", "HAPD_IFACE_UNINITIALIZED"); PR("State: %s\n", "UNINITIALIZED");
return 0; return 0;
case WIFI_HAPD_IFACE_DISABLED: case WIFI_SAP_IFACE_DISABLED:
PR("State: %s\n", "HAPD_IFACE_DISABLED"); PR("State: %s\n", "DISABLED");
return 0; return 0;
case WIFI_HAPD_IFACE_COUNTRY_UPDATE: case WIFI_SAP_IFACE_COUNTRY_UPDATE:
PR("State: %s\n", "HAPD_IFACE_DISABLED"); PR("State: %s\n", "COUNTRY_UPDATE");
return 0; return 0;
case WIFI_HAPD_IFACE_ACS: case WIFI_SAP_IFACE_ACS:
PR("State: %s\n", "HAPD_IFACE_DISABLED"); PR("State: %s\n", "ACS");
return 0; return 0;
case WIFI_HAPD_IFACE_HT_SCAN: case WIFI_SAP_IFACE_HT_SCAN:
PR("State: %s\n", "HAPD_IFACE_DISABLED"); PR("State: %s\n", "HT_SCAN");
return 0; return 0;
case WIFI_HAPD_IFACE_DFS: case WIFI_SAP_IFACE_DFS:
PR("State: %s\n", "HAPD_IFACE_DISABLED"); PR("State: %s\n", "DFS");
break; break;
case WIFI_HAPD_IFACE_ENABLED: case WIFI_SAP_IFACE_ENABLED:
PR("State: %s\n", "ENABLED");
break; break;
default: default:
return 0; return 0;