From 85f0ab5adc1aedb24899e1c95301826fa8fd4038 Mon Sep 17 00:00:00 2001
From: Bruin06 <419738327@qq.com>
Date: Tue, 27 May 2025 19:56:47 +0800
Subject: [PATCH] Change Macro

Signed-off-by: Bruin06 <419738327@qq.com>
---
 wpa_supplicant-2.9_standard/src/p2p/p2p.c     |  4 ++--
 wpa_supplicant-2.9_standard/src/p2p/p2p_i.h   |  8 +++++---
 .../wpa_supplicant/ctrl_iface.c               | 20 +++++++++----------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p.c b/wpa_supplicant-2.9_standard/src/p2p/p2p.c
index 581ceb3..c67c583 100644
--- a/wpa_supplicant-2.9_standard/src/p2p/p2p.c
+++ b/wpa_supplicant-2.9_standard/src/p2p/p2p.c
@@ -1958,7 +1958,7 @@ int p2p_go_params(struct p2p_data *p2p, struct p2p_go_neg_results *params)
 	}
 	p2p->ssid_set = 0;
 
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 	if (p2p->passphrase_set) {
 		os_memcpy(params->passphrase, p2p->passphrase, os_strlen(p2p->passphrase));
 	} else {
@@ -1971,7 +1971,7 @@ int p2p_go_params(struct p2p_data *p2p, struct p2p_go_neg_results *params)
 	p2p_random(params->passphrase, p2p->cfg->passphrase_len);
 	params->passphrase[p2p->cfg->passphrase_len] = '\0';
 	return 0;
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 }
 
 
diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h b/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h
index d7ac122..0bb1d8c 100644
--- a/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h
+++ b/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h
@@ -11,9 +11,9 @@
 
 #include "utils/list.h"
 #include "drivers/driver.h"
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 #include "ap/ap_config.h"
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 #include "p2p.h"
 
 #define P2P_GO_NEG_CNF_MAX_RETRY_COUNT 1
@@ -617,9 +617,11 @@ struct p2p_data {
 #ifdef HARMONY_CONNECTIVITY_PATCH
 	int persistent_group_need_remove;
 	u8 pvt_p2p_service;
+#endif
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 	char passphrase[MAX_PASSPHRASE_LEN + 1];
 	int passphrase_set;
-#endif
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 };
 
 enum p2p_pvt_service {
diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
index 54db030..545398b 100644
--- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
+++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c
@@ -109,9 +109,9 @@
 
 #define CLIENTLIST_BUFF 200
 #define CLIENTLIST_MAX_LEN 144
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 #define DEFAULT_TEMP_ID (-100)
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 
 static int wpa_supplicant_global_iface_list(struct wpa_global *global,
 					    char *buf, int len);
@@ -4062,7 +4062,7 @@ static void wpa_supplicant_set_rptinfo(struct wpa_supplicant *wpa_s,
 }
 #endif
 
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 static void p2p_set_temp_group(struct wpa_supplicant *wpa_s,
 	char *name, char *value)
 {
@@ -4080,7 +4080,7 @@ static void p2p_set_temp_group(struct wpa_supplicant *wpa_s,
 		}
 	}
 }
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 
 int wpa_supplicant_ctrl_iface_set_network(
 	struct wpa_supplicant *wpa_s, char *cmd)
@@ -4110,12 +4110,12 @@ int wpa_supplicant_ctrl_iface_set_network(
 #ifdef CONFIG_WIFI_RPT
 	wpa_supplicant_set_rptinfo(wpa_s, name, value, id);
 #endif /* CONFIG_WIFI_RPT */
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 	if (id == DEFAULT_TEMP_ID) {
 		p2p_set_temp_group(wpa_s, name, value);
 		return 0;
 	}
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 #ifdef CONFIG_EAP_AUTH
 	if (wpa_supplicant_ctrl_iface_get_eap_params(name, value))
 		wpa_printf(MSG_INFO, "get eap params success");
@@ -7693,7 +7693,7 @@ static int p2p_ctrl_group_add_persistent(struct wpa_supplicant *wpa_s,
 }
 
 
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 static int p2p_ctrl_create_temp_group(struct wpa_supplicant *wpa_s, char *cmd)
 {
 	int freq = 0, persistent = 0;
@@ -7707,7 +7707,7 @@ static int p2p_ctrl_create_temp_group(struct wpa_supplicant *wpa_s, char *cmd)
 	return wpas_p2p_group_add(wpa_s, persistent, freq, 0, ht40, vht,
 		CHANWIDTH_USE_HT, he, 0, false);
 }
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 
 int p2p_ctrl_group_add(struct wpa_supplicant *wpa_s, char *cmd)
 {
@@ -13580,11 +13580,11 @@ char * wpa_supplicant_ctrl_iface_process(struct wpa_supplicant *wpa_s,
 	} else if (os_strncmp(buf, "P2P_ASP_PROVISION_RESP ", 23) == 0) {
 		if (p2p_ctrl_asp_provision_resp(wpa_s, buf + 23))
 			reply_len = -1;
-#ifdef HARMONY_CONNECTIVITY_PATCH
+#ifdef CONFIG_OPEN_HARMONY_PATCH
 	} else if (os_strncmp(buf, "CREATE_TEMP_GROUP ", 18) == 0) {
 		if (p2p_ctrl_create_temp_group(wpa_s, buf + 18))
 			reply_len = -1;
-#endif /* HARMONY_CONNECTIVITY_PATCH */
+#endif /* CONFIG_OPEN_HARMONY_PATCH */
 #ifdef CONFIG_MAGICLINK
 	} else if (os_strncmp(buf, "MAGICLINK ",
 			      os_strlen("MAGICLINK ")) == 0) {
-- 
Gitee