From bb6112f6562340499caabf3f5c6529dff10a4db6 Mon Sep 17 00:00:00 2001 From: l30052082 Date: Thu, 10 Apr 2025 14:14:34 +0800 Subject: [PATCH] p2p channel opt Signed-off-by: l30052082 --- wpa_supplicant-2.9_standard/src/ap/sta_info.c | 6 +++--- .../src/common/ieee802_11_common.c | 18 +++++++++--------- .../src/common/ieee802_11_common.h | 2 +- wpa_supplicant-2.9_standard/src/p2p/p2p.c | 8 ++++---- wpa_supplicant-2.9_standard/src/p2p/p2p.h | 4 ++-- .../src/p2p/p2p_go_neg.c | 8 ++++---- wpa_supplicant-2.9_standard/src/p2p/p2p_i.h | 2 +- .../src/p2p/p2p_invitation.c | 6 +++--- .../wpa_supplicant/ctrl_iface.c | 4 ++-- .../wpa_supplicant/p2p_supplicant.c | 4 ++-- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wpa_supplicant-2.9_standard/src/ap/sta_info.c b/wpa_supplicant-2.9_standard/src/ap/sta_info.c index 1fa2802..3ceb971 100644 --- a/wpa_supplicant-2.9_standard/src/ap/sta_info.c +++ b/wpa_supplicant-2.9_standard/src/ap/sta_info.c @@ -36,7 +36,7 @@ #include "wnm_ap.h" #include "mbo_ap.h" #include "ndisc_snoop.h" -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) #include "hm_miracast_sink.h" #endif #include "sta_info.h" @@ -1528,7 +1528,7 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd, #ifdef CONFIG_P2P u8 addr[ETH_ALEN]; u8 ip_addr_buf[4]; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) struct hm_p2p_pvt_peer *peer = NULL; #endif #endif /* CONFIG_P2P */ @@ -1578,7 +1578,7 @@ void ap_sta_set_authorized_event(struct hostapd_data *hapd, ip_addr_buf[2], ip_addr_buf[3]); ip_ptr = ip_addr_buf; } -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) peer = hm_p2p_find_peer(dev_addr); if (peer != NULL) { peer->go_req_cnt = 0; diff --git a/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.c b/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.c index f4fc8b1..fa43a82 100644 --- a/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.c +++ b/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.c @@ -16,7 +16,7 @@ #include "ieee802_11_defs.h" #include "ieee802_11_common.h" -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) #include "hm_miracast_sink.h" #endif @@ -176,18 +176,12 @@ static int ieee802_11_parse_vendor_specific(const u8 *pos, size_t elen, } break; - case OUI_QCA: + case OUI_QCA: { switch (pos[3]) { case QCA_VENDOR_ELEM_P2P_PREF_CHAN_LIST: elems->pref_freq_list = pos; elems->pref_freq_list_len = elen; break; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) - case HM_PVT_VENDOR_P2P_OUI: - if (hm_ieee80211_parse_vendor_opt_ie(pos, elen, elems)) - wpa_printf(MSG_ERROR, "hm_ieee80211_parse_vendor_opt_ie parse vendor p2p oui fail"); - break; -#endif default: wpa_printf(MSG_EXCESSIVE, "Unknown QCA information element ignored (type=%d len=%lu)", @@ -195,7 +189,13 @@ static int ieee802_11_parse_vendor_specific(const u8 *pos, size_t elen, return -1; } break; - + } +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) + case HM_PVT_VENDOR_P2P_OUI: + if (hm_ieee80211_parse_vendor_opt_ie(pos, elen, elems)) + wpa_printf(MSG_ERROR, "hm_ieee80211_parse_vendor_opt_ie parse vendor p2p oui fail"); + break; +#endif default: wpa_printf(MSG_EXCESSIVE, "unknown vendor specific " "information element ignored (vendor OUI " diff --git a/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.h b/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.h index 5ba914c..682f82e 100644 --- a/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.h +++ b/wpa_supplicant-2.9_standard/src/common/ieee802_11_common.h @@ -104,7 +104,7 @@ struct ieee802_11_elems { const u8 *fils_pk; const u8 *fils_nonce; const u8 *owe_dh; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) const u8 *pvt_peer_band; const u8 *pvt_peer_ch; const u8 *pvt_peer_cap; diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p.c b/wpa_supplicant-2.9_standard/src/p2p/p2p.c index bcdef24..f9c437d 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p.c +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p.c @@ -49,7 +49,7 @@ static void p2p_process_presence_resp(struct p2p_data *p2p, const u8 *da, const u8 *sa, const u8 *data, size_t len); -#if !defined(CONFIG_OPEN_HARMONY_PATCH) || !defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if !defined(CONFIG_OPEN_HARMONY_PATCH) || !defined(CONFIG_MIRACAST_SINK_OPT) static void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx); #endif static void p2p_scan_timeout(void *eloop_ctx, void *timeout_ctx); @@ -2560,7 +2560,7 @@ p2p_reply_probe(struct p2p_data *p2p, const u8 *addr, const u8 *dst, return P2P_PREQ_NOT_P2P; } -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) hm_p2p_save_peer_info(&elems, addr); #endif @@ -3176,7 +3176,7 @@ struct p2p_data * p2p_init(const struct p2p_config *cfg) /* GO negotiation optimization initial, set enable to 1 and process to 1*/ p2p_set_enable_go_neg_opt(p2p, 1); p2p_set_process_go_neg_opt(p2p, 1); -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) p2p->calculated_go_intent = P2P_GO_NEG_OPT_INTENT; #endif #endif @@ -4856,7 +4856,7 @@ static void p2p_process_presence_resp(struct p2p_data *p2p, const u8 *da, p2p_parse_free(&msg); } -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx) #else static void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx) diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p.h b/wpa_supplicant-2.9_standard/src/p2p/p2p.h index aeb206a..045b979 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p.h +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p.h @@ -40,7 +40,7 @@ struct weighted_pcl; */ #define P2P_MAX_REG_CLASS_CHANNELS 60 -#ifdef HARMONY_P2P_CONNECTIVITY_PATCH +#if defined(HARMONY_P2P_CONNECTIVITY_PATCH) || defined(CONFIG_MIRACAST_SINK_OPT) /** * P2P_GO_NEG_OPT_INTENT - p2p go negotiation optimization intent value */ @@ -2473,7 +2473,7 @@ void set_p2p_allow_6ghz(struct p2p_data *p2p, bool value); int p2p_remove_6ghz_channels(struct weighted_pcl *pref_freq_list, int size); int p2p_channel_to_freq(int op_class, int channel); -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) void p2p_ext_listen_timeout(void *eloop_ctx, void *timeout_ctx); #endif diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p_go_neg.c b/wpa_supplicant-2.9_standard/src/p2p/p2p_go_neg.c index 6fa3cce..0938577 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p_go_neg.c +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p_go_neg.c @@ -20,7 +20,7 @@ #ifdef CONFIG_OPEN_HARMONY_PATCH #include "wpa_supplicant_i.h" #define LTECOEX_SAFE_CHANNEL 6 -#ifdef OPEN_HARMONY_MIRACAST_SINK_OPT +#ifdef CONFIG_MIRACAST_SINK_OPT #include "securec.h" #include "p2p_supplicant.h" #include "hm_miracast_sink.h" @@ -663,7 +663,7 @@ int p2p_go_select_channel(struct p2p_data *p2p, struct p2p_device *dev, u8 *status) { struct p2p_channels tmp, intersection; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) int pvt_peer = FALSE; struct hm_p2p_pvt_peer pvt_peer_info; #endif @@ -684,7 +684,7 @@ int p2p_go_select_channel(struct p2p_data *p2p, struct p2p_device *dev, return -1; } -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) pvt_peer = hm_p2p_get_peer_info(dev, &pvt_peer_info); p2p_dbg(p2p, "origin pepare operating channel (op_class %u channel %u)", @@ -711,7 +711,7 @@ int p2p_go_select_channel(struct p2p_data *p2p, struct p2p_device *dev, p2p->op_reg_class, p2p->op_channel); p2p_reselect_channel(p2p, &intersection); } -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) } #endif 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 f2cdd4b..7c7c77f 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p_i.h @@ -599,7 +599,7 @@ struct p2p_data { bool allow_6ghz; #ifdef CONFIG_OPEN_HARMONY_PATCH u8 ltecoex_flag; -#ifdef OPEN_HARMONY_MIRACAST_SINK_OPT +#ifdef CONFIG_MIRACAST_SINK_OPT u8 calculated_go_intent; unsigned int original_ext_listen_period; u8 original_reg_class; diff --git a/wpa_supplicant-2.9_standard/src/p2p/p2p_invitation.c b/wpa_supplicant-2.9_standard/src/p2p/p2p_invitation.c index 615c379..e8f6cce 100644 --- a/wpa_supplicant-2.9_standard/src/p2p/p2p_invitation.c +++ b/wpa_supplicant-2.9_standard/src/p2p/p2p_invitation.c @@ -14,7 +14,7 @@ #include "p2p_i.h" #include "p2p.h" -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) #include "hm_miracast_sink.h" #endif @@ -202,7 +202,7 @@ void p2p_process_invitation_req(struct p2p_data *p2p, const u8 *sa, u8 reg_class = 0, channel = 0; struct p2p_channels all_channels, intersection, *channels = NULL; int persistent; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) struct hm_p2p_pvt_peer pvt_peer_info; int pvt_peer = 0; #endif @@ -389,7 +389,7 @@ void p2p_process_invitation_req(struct p2p_data *p2p, const u8 *sa, } #endif -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) if (go) { u8 operating_channel = ((msg.operating_channel == NULL) ? 0 : msg.operating_channel[HM_OPERATING_CHANNEL_POS]); 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 5d1c202..0380a3d 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c @@ -80,10 +80,10 @@ #ifdef CONFIG_OPEN_HARMONY_PATCH #include "p2p/p2p_i.h" +#endif #ifdef CONFIG_MIRACAST_SINK_OPT #include "hm_miracast_sink.h" #endif -#endif #ifdef OPEN_HARMONY_P2P_ONEHOP_FIND #include "p2p_onehop_scan_opt.h" #endif @@ -6906,7 +6906,7 @@ int p2p_ctrl_connect(struct wpa_supplicant *wpa_s, char *cmd, return -1; } #ifdef CONFIG_OPEN_HARMONY_PATCH -#ifdef OPEN_HARMONY_MIRACAST_SINK_OPT +#ifdef CONFIG_MIRACAST_SINK_OPT go_intent = hm_wpas_go_neg_vendor_intent_opt(wpa_s, go_intent, addr); #else #ifdef HARMONY_P2P_CONNECTIVITY_PATCH diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c index 75c634d..74e6940 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/p2p_supplicant.c @@ -64,7 +64,7 @@ #endif #ifdef CONFIG_OPEN_HARMONY_PATCH -#ifdef OPEN_HARMONY_MIRACAST_SINK_OPT +#ifdef CONFIG_MIRACAST_SINK_OPT #include "hm_miracast_sink.h" #endif #endif @@ -6818,7 +6818,7 @@ int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr, wpa_s->global->pending_p2ps_group_freq = 0; wpa_s->p2ps_method_config_any = 0; -#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(OPEN_HARMONY_MIRACAST_SINK_OPT) +#if defined(CONFIG_OPEN_HARMONY_PATCH) && defined(CONFIG_MIRACAST_SINK_OPT) go_intent = hm_wpas_go_neg_vendor_intent_opt(wpa_s, go_intent, peer_addr); #endif -- Gitee