<div>Single channel concurrency Patch [2/4]</div><div><br></div><div><span style>This patch handles the case where a p2p join fails due to a freq conflict with the existing STA connection.</span></div><div><span style><br>
</span></div><div><span style><font color="#222222" face="arial, sans-serif"><div> [PATCH] If P2P Join fails due to frequency conflict, indicate via appropriate</div><div> reason code.</div><div> Signed-hostap: Jithu Jance <<a href="mailto:jithu@broadcom.com">jithu@broadcom.com</a>></div>
<div><br></div><div>---</div><div> wpa_supplicant/p2p_supplicant.c | 9 +++++++++</div><div> 1 files changed, 9 insertions(+), 0 deletions(-)</div><div><br></div><div>diff --git a/wpa_supplicant/p2p_supplicant.c b/wpa_supplicant/p2p_supplicant.c</div>
<div>index 486a551..b870c4e 100644</div><div>--- a/wpa_supplicant/p2p_supplicant.c</div><div>+++ b/wpa_supplicant/p2p_supplicant.c</div><div>@@ -2609,6 +2609,7 @@ static void wpas_p2p_scan_res_join(struct wpa_supplicant *wpa_s,</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>struct wpa_bss *bss;</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>int freq;</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>u8 iface_addr[ETH_ALEN];</div>
<div>+<span class="Apple-tab-span" style="white-space:pre"> </span>int shared_freq = 0;</div><div> </div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);</div>
<div> </div><div>@@ -2644,6 +2645,14 @@ static void wpas_p2p_scan_res_join(struct wpa_supplicant *wpa_s,</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>wpa_printf(MSG_DEBUG, "P2P: Target GO operating frequency "</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span> "from P2P peer table: %d MHz", freq);</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>}</div><div>+</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT) &&</div>
<div>+<span class="Apple-tab-span" style="white-space:pre"> </span>((shared_freq = wpa_drv_shared_freq(wpa_s)) > 0) && (shared_freq != freq)) {</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>wpa_msg(wpa_s->parent, MSG_INFO,</div>
<div>+<span class="Apple-tab-span" style="white-space:pre"> </span>P2P_EVENT_GROUP_FORMATION_FAILURE "reason=FREQ_CONFLICT");</div><div>+<span class="Apple-tab-span" style="white-space:pre"> </span>return;</div>
<div>+<span class="Apple-tab-span" style="white-space:pre"> </span>}</div><div>+</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>bss = wpa_bss_get_bssid(wpa_s, wpa_s->pending_join_iface_addr);</div>
<div> <span class="Apple-tab-span" style="white-space:pre"> </span>if (bss) {</div><div> <span class="Apple-tab-span" style="white-space:pre"> </span>freq = bss->freq;</div><div>-- </div><div>1.7.4.1</div></font></span></div>
<div><br></div><div><br></div>- Jithu Jance