Skip to content

Commit 10d4de5

Browse files
MaochenWang1kartben
authored andcommitted
net: wifi: remove HAPD in Wi-Fi shell layer
For CMD 'wifi ap status', removing HAPD related definition to make it more commonly used for non-supplicant case. Signed-off-by: Maochen Wang <[email protected]>
1 parent 9d4c027 commit 10d4de5

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

include/zephyr/net/wifi_mgmt.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,14 +1219,14 @@ struct wifi_wps_config_params {
12191219

12201220
/** Wi-Fi AP status
12211221
*/
1222-
enum wifi_hostapd_iface_state {
1223-
WIFI_HAPD_IFACE_UNINITIALIZED,
1224-
WIFI_HAPD_IFACE_DISABLED,
1225-
WIFI_HAPD_IFACE_COUNTRY_UPDATE,
1226-
WIFI_HAPD_IFACE_ACS,
1227-
WIFI_HAPD_IFACE_HT_SCAN,
1228-
WIFI_HAPD_IFACE_DFS,
1229-
WIFI_HAPD_IFACE_ENABLED
1222+
enum wifi_sap_iface_state {
1223+
WIFI_SAP_IFACE_UNINITIALIZED,
1224+
WIFI_SAP_IFACE_DISABLED,
1225+
WIFI_SAP_IFACE_COUNTRY_UPDATE,
1226+
WIFI_SAP_IFACE_ACS,
1227+
WIFI_SAP_IFACE_HT_SCAN,
1228+
WIFI_SAP_IFACE_DFS,
1229+
WIFI_SAP_IFACE_ENABLED
12301230
};
12311231

12321232
#include <zephyr/net/net_if.h>

subsys/net/l2/wifi/wifi_shell.c

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,25 +1177,26 @@ static int cmd_wifi_ap_status(const struct shell *sh, size_t argc, char *argv[])
11771177
}
11781178

11791179
switch (status.state) {
1180-
case WIFI_HAPD_IFACE_UNINITIALIZED:
1181-
PR("State: %s\n", "HAPD_IFACE_UNINITIALIZED");
1180+
case WIFI_SAP_IFACE_UNINITIALIZED:
1181+
PR("State: %s\n", "UNINITIALIZED");
11821182
return 0;
1183-
case WIFI_HAPD_IFACE_DISABLED:
1184-
PR("State: %s\n", "HAPD_IFACE_DISABLED");
1183+
case WIFI_SAP_IFACE_DISABLED:
1184+
PR("State: %s\n", "DISABLED");
11851185
return 0;
1186-
case WIFI_HAPD_IFACE_COUNTRY_UPDATE:
1187-
PR("State: %s\n", "HAPD_IFACE_DISABLED");
1186+
case WIFI_SAP_IFACE_COUNTRY_UPDATE:
1187+
PR("State: %s\n", "COUNTRY_UPDATE");
11881188
return 0;
1189-
case WIFI_HAPD_IFACE_ACS:
1190-
PR("State: %s\n", "HAPD_IFACE_DISABLED");
1189+
case WIFI_SAP_IFACE_ACS:
1190+
PR("State: %s\n", "ACS");
11911191
return 0;
1192-
case WIFI_HAPD_IFACE_HT_SCAN:
1193-
PR("State: %s\n", "HAPD_IFACE_DISABLED");
1192+
case WIFI_SAP_IFACE_HT_SCAN:
1193+
PR("State: %s\n", "HT_SCAN");
11941194
return 0;
1195-
case WIFI_HAPD_IFACE_DFS:
1196-
PR("State: %s\n", "HAPD_IFACE_DISABLED");
1195+
case WIFI_SAP_IFACE_DFS:
1196+
PR("State: %s\n", "DFS");
11971197
break;
1198-
case WIFI_HAPD_IFACE_ENABLED:
1198+
case WIFI_SAP_IFACE_ENABLED:
1199+
PR("State: %s\n", "ENABLED");
11991200
break;
12001201
default:
12011202
return 0;

0 commit comments

Comments
 (0)