Revert "[nrf fromlist] net: wifi: Fix DPP disabled build"

This reverts commit 330eb81.

Signed-off-by: Chaitanya Tata <[email protected]>

Author: krish2718

include/zephyr/net/wifi_mgmt.h

@@ -219,13 +219,11 @@ NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD);
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_AP_CONFIG_PARAM);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** Request a Wi-Fi DPP operation */
 #define NET_REQUEST_WIFI_DPP			\
 	(_NET_WIFI_BASE | NET_REQUEST_WIFI_CMD_DPP)
 
 NET_MGMT_DEFINE_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_WNM
 /** Request a Wi-Fi BTM query */
@@ -852,7 +850,6 @@ struct wifi_ap_config_params {
 	uint32_t max_num_sta;
 };
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /** @brief Wi-Fi DPP configuration parameter */
 /** Wi-Fi DPP QR-CODE in string max len for SHA512 */
 #define WIFI_DPP_QRCODE_MAX_LEN 255
@@ -1029,8 +1026,6 @@ struct wifi_dpp_params {
 	};
 };
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-
 #include <zephyr/net/net_if.h>
 
 /** Scan result callback
@@ -1237,8 +1232,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*ap_config_params)(const struct device *dev, struct wifi_ap_config_params *params);
-
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	/** Dispatch DPP operations by action enum, with or without arguments in string format
 	 *
 	 * @param dev Pointer to the device structure for the driver instance
@@ -1247,7 +1240,6 @@ struct wifi_mgmt_ops {
 	 * @return 0 if ok, < 0 if error
 	 */
 	int (*dpp_dispatch)(const struct device *dev, struct wifi_dpp_params *params);
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	/** Flush PMKSA cache entries
 	 *
 	 * @param dev Pointer to the device structure for the driver instance.

modules/hostap/src/supp_api.c

@@ -1767,7 +1767,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 }
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static const char *dpp_params_to_args_curve(int curve)
 {
 	switch (curve) {

modules/hostap/src/supp_api.h

@@ -269,7 +269,6 @@ int supplicant_ap_sta_disconnect(const struct device *dev,
 
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 /**
  * @brief Dispatch DPP operations for STA
  *

modules/hostap/src/supp_main.c

@@ -80,9 +80,7 @@ static const struct wifi_mgmt_ops mgmt_ops = {
 	.ap_disable = supplicant_ap_disable,
 	.ap_sta_disconnect = supplicant_ap_sta_disconnect,
 #endif /* CONFIG_AP */
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	.dpp_dispatch = supplicant_dpp_dispatch,
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	.pmksa_flush = supplicant_pmksa_flush,
 #ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_ENTERPRISE
 	.enterprise_creds = supplicant_add_enterprise_creds,

subsys/net/l2/wifi/wifi_mgmt.c

@@ -852,7 +852,6 @@ static int wifi_set_rts_threshold(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_RTS_THRESHOLD, wifi_set_rts_threshold);
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 		    void *data, size_t len)
 {
@@ -869,8 +868,6 @@ static int wifi_dpp(uint32_t mgmt_request, struct net_if *iface,
 
 NET_MGMT_REGISTER_REQUEST_HANDLER(NET_REQUEST_WIFI_DPP, wifi_dpp);
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
-
 static int wifi_pmksa_flush(uint32_t mgmt_request, struct net_if *iface,
 					   void *data, size_t len)
 {

subsys/net/l2/wifi/wifi_shell.c

@@ -2143,7 +2143,6 @@ static int cmd_wifi_version(const struct shell *sh, size_t argc, char *argv[])
 	return 0;
 }
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 static int parse_dpp_args_auth_init(const struct shell *sh, size_t argc, char *argv[],
 				    struct wifi_dpp_params *params)
 {
@@ -2681,7 +2680,6 @@ static int cmd_wifi_dpp_reconfig(const struct shell *sh, size_t argc, char *argv
 	return 0;
 }
 
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 static int cmd_wifi_pmksa_flush(const struct shell *sh, size_t argc, char *argv[])
 {
 	struct net_if *iface = net_if_get_wifi_sta();
@@ -2759,7 +2757,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_twt_ops,
 	SHELL_SUBCMD_SET_END
 );
 
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 SHELL_STATIC_SUBCMD_SET_CREATE(
 	wifi_cmd_dpp,
 	SHELL_CMD_ARG(configurator_add, NULL,
@@ -2836,7 +2833,6 @@ SHELL_STATIC_SUBCMD_SET_CREATE(
 		      cmd_wifi_dpp_reconfig, 2, 0),
 	SHELL_SUBCMD_SET_END
 );
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 
 SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 	SHELL_CMD_ARG(version, NULL, "Print Wi-Fi Driver and Firmware versions\n",
@@ -2973,9 +2969,7 @@ SHELL_STATIC_SUBCMD_SET_CREATE(wifi_commands,
 		      "<rts_threshold: rts threshold/off>.\n",
 		      cmd_wifi_set_rts_threshold,
 		      1, 1),
-#ifdef CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP
 	SHELL_CMD(dpp, &wifi_cmd_dpp, "DPP actions\n", NULL),
-#endif /* CONFIG_WIFI_NM_WPA_SUPPLICANT_DPP */
 	SHELL_CMD_ARG(pmksa_flush, NULL,
 		     "Flush PMKSA cache entries.\n",
 		     cmd_wifi_pmksa_flush, 1, 0),