Wrap some functions in CONFIG_DPP
The enum dpp_status_error is defined in dpp.h, so these functions
technically shouldn't be defined if CONFIG_DPP is not defined.
Bug: 365585450
Test: m
Change-Id: I0a14fb0a09b2d2d8d0e06e6f8ccd5d5e6b042996
diff --git a/wpa_supplicant/aidl/vendor/aidl.h b/wpa_supplicant/aidl/vendor/aidl.h
index eb1426a..71620f4 100644
--- a/wpa_supplicant/aidl/vendor/aidl.h
+++ b/wpa_supplicant/aidl/vendor/aidl.h
@@ -110,8 +110,10 @@
void wpas_aidl_notify_dpp_config_received(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, bool conn_status_requested);
void wpas_aidl_notify_dpp_config_sent(struct wpa_supplicant *wpa_s);
+#ifdef CONFIG_DPP
void wpas_aidl_notify_dpp_connection_status_sent(struct wpa_supplicant *wpa_s,
enum dpp_status_error result);
+#endif /* CONFIG_DPP */
void wpas_aidl_notify_dpp_auth_success(struct wpa_supplicant *wpa_s);
void wpas_aidl_notify_dpp_resp_pending(struct wpa_supplicant *wpa_s);
void wpas_aidl_notify_dpp_not_compatible(struct wpa_supplicant *wpa_s);
@@ -124,9 +126,11 @@
void wpas_aidl_notify_dpp_config_sent_wait_response(struct wpa_supplicant *wpa_s);
void wpas_aidl_notify_dpp_config_accepted(struct wpa_supplicant *wpa_s);
void wpas_aidl_notify_dpp_config_rejected(struct wpa_supplicant *wpa_s);
+#ifdef CONFIG_DPP
void wpas_aidl_notify_dpp_conn_status(struct wpa_supplicant *wpa_s,
enum dpp_status_error status, const char *ssid,
const char *channel_list, unsigned short band_list[], int size);
+#endif /* CONFIG_DPP */
void wpas_aidl_notify_pmk_cache_added(
struct wpa_supplicant *wpas, struct rsn_pmksa_cache_entry *pmksa_entry);
void wpas_aidl_notify_bss_tm_status(struct wpa_supplicant *wpa_s);
@@ -274,9 +278,11 @@
{}
static void wpas_aidl_notify_dpp_config_sent(struct wpa_supplicant *wpa_s)
{}
+#ifdef CONFIG_DPP
static void wpas_aidl_notify_dpp_connection_status_sent(struct wpa_supplicant *wpa_s,
enum dpp_status_error result)
{}
+#endif /* CONFIG_DPP */
static void wpas_aidl_notify_dpp_auth_success(struct wpa_supplicant *wpa_s)
{}
static void wpas_aidl_notify_dpp_resp_pending(struct wpa_supplicant *wpa_s)
@@ -301,10 +307,12 @@
{}
static void wpas_aidl_notify_dpp_config_rejected(struct wpa_supplicant *wpa_s)
{}
+#ifdef CONFIG_DPP
static void wpas_aidl_notify_dpp_conn_status(struct wpa_supplicant *wpa_s,
enum dpp_status_error status, const char *ssid,
const char *channel_list, unsigned short band_list[], int size)
{}
+#endif /* CONFIG_DPP */
static void wpas_aidl_notify_pmk_cache_added(struct wpa_supplicant *wpas,
struct rsn_pmksa_cache_entry *pmksa_entry)
{}
diff --git a/wpa_supplicant/notify.c b/wpa_supplicant/notify.c
index 1fb2628..2dc68b0 100644
--- a/wpa_supplicant/notify.c
+++ b/wpa_supplicant/notify.c
@@ -1222,6 +1222,7 @@
#endif /* CONFIG_DPP */
}
+#ifdef CONFIG_DPP
void wpas_notify_dpp_connection_status_sent(struct wpa_supplicant *wpa_s,
enum dpp_status_error result)
{
@@ -1232,6 +1233,7 @@
wpas_aidl_notify_dpp_connection_status_sent(wpa_s, result);
#endif /* CONFIG_DPP2 */
}
+#endif /* CONFIG_DPP */
/* DPP Progress notifications */
void wpas_notify_dpp_auth_success(struct wpa_supplicant *wpa_s)
@@ -1329,6 +1331,7 @@
#endif /* CONFIG_DPP2 */
}
+#ifdef CONFIG_DPP
void wpas_notify_dpp_conn_status(struct wpa_supplicant *wpa_s,
enum dpp_status_error status, const char *ssid,
const char *channel_list, unsigned short band_list[], int size)
@@ -1337,6 +1340,7 @@
wpas_aidl_notify_dpp_conn_status(wpa_s, status, ssid, channel_list, band_list, size);
#endif /* CONFIG_DPP2 */
}
+#endif /* CONFIG_DPP */
void wpas_notify_dpp_config_rejected(struct wpa_supplicant *wpa_s)
{
diff --git a/wpa_supplicant/notify.h b/wpa_supplicant/notify.h
index 85326da..4e172de 100644
--- a/wpa_supplicant/notify.h
+++ b/wpa_supplicant/notify.h
@@ -190,8 +190,10 @@
void wpas_notify_dpp_config_received(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, bool conn_status_requested);
void wpas_notify_dpp_config_sent(struct wpa_supplicant *wpa_s);
+#ifdef CONFIG_DPP
void wpas_notify_dpp_connection_status_sent(struct wpa_supplicant *wpa_s,
enum dpp_status_error result);
+#endif /* CONFIG_DPP */
void wpas_notify_dpp_auth_success(struct wpa_supplicant *wpa_s);
void wpas_notify_dpp_resp_pending(struct wpa_supplicant *wpa_s);
void wpas_notify_dpp_not_compatible(struct wpa_supplicant *wpa_s);
@@ -201,9 +203,11 @@
void wpas_notify_dpp_auth_failure(struct wpa_supplicant *wpa_s);
void wpas_notify_dpp_failure(struct wpa_supplicant *wpa_s);
void wpas_notify_dpp_config_sent_wait_response(struct wpa_supplicant *wpa_s);
+#ifdef CONFIG_DPP
void wpas_notify_dpp_conn_status(struct wpa_supplicant *wpa_s,
enum dpp_status_error status, const char *ssid,
const char *channel_list, unsigned short band_list[], int size);
+#endif /* CONFIG_DPP */
void wpas_notify_dpp_config_accepted(struct wpa_supplicant *wpa_s);
void wpas_notify_dpp_config_rejected(struct wpa_supplicant *wpa_s);
void wpas_notify_transition_disable(struct wpa_supplicant *wpa_s,