Skip to content

Commit 4a7d061

Browse files
D-Trivenirado17
authored andcommitted
[nrf fromtree] net: Fix Kconfig check for enterprise mode
Fix the kconfig check for enterprise crypto support in AP mode. Also, remove the unnecessary Hostapd enterprise crypto check in credentials code. Signed-off-by: Triveni Danda <[email protected]> (cherry picked from commit b3ea4f8)
1 parent 8492aab commit 4a7d061

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

subsys/net/l2/wifi/wifi_shell.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2136,7 +2136,7 @@ static int cmd_wifi_ap_enable(const struct shell *sh, size_t argc,
21362136
return -ENOEXEC;
21372137
}
21382138

2139-
#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
2139+
#ifdef CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
21402140
/* Load the enterprise credentials if needed */
21412141
if (cnx_params.security == WIFI_SECURITY_TYPE_EAP_TLS ||
21422142
cnx_params.security == WIFI_SECURITY_TYPE_EAP_PEAP_MSCHAPV2 ||

subsys/net/lib/wifi_credentials/wifi_credentials_shell.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ static const char client_key2_test[] = {
5454
'\0'};
5555
#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
5656

57-
#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE || \
58-
defined CONFIG_WIFI_NM_HOSTAPD_CRYPTO_ENTERPRISE
57+
#if defined CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
5958
static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *iface)
6059
{
6160
struct wifi_enterprise_creds_params params = {0};
@@ -80,7 +79,7 @@ static int cmd_wifi_set_enterprise_creds(const struct shell *sh, struct net_if *
8079

8180
return 0;
8281
}
83-
#endif
82+
#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE */
8483

8584
static void print_network_info(void *cb_arg, const char *ssid, size_t ssid_len)
8685
{

0 commit comments

Comments
 (0)