Revert "Revert "[wpa_supplicant] cumilative patch from commit 3a..."
Revert submission 28102966-revert-26533062-Supplicant_merge_June24-CUATTSRBBR
Reason for revert: Fixed the regression issue (ag/28389573)
Reverted changes: /q/submissionid:28102966-revert-26533062-Supplicant_merge_June24-CUATTSRBBR
Bug: 329004037
Test: Turn ON/OFF SoftAp multiple times
Change-Id: Ibfff2a847be5678f1a6d77e28506a05936812a91
diff --git a/src/p2p/p2p_invitation.c b/src/p2p/p2p_invitation.c
index 941ec00..70a7f6f 100644
--- a/src/p2p/p2p_invitation.c
+++ b/src/p2p/p2p_invitation.c
@@ -33,8 +33,8 @@
for (i = 0; i < p2p->num_groups; i++) {
struct p2p_group *g = p2p->groups[i];
struct wpabuf *ie;
- if (os_memcmp(p2p_group_get_interface_addr(g),
- p2p->inv_bssid, ETH_ALEN) != 0)
+ if (!ether_addr_equal(p2p_group_get_interface_addr(g),
+ p2p->inv_bssid))
continue;
ie = p2p_group_get_wfd_ie(g);
if (ie) {
@@ -127,8 +127,8 @@
for (i = 0; i < p2p->num_groups; i++) {
struct p2p_group *g = p2p->groups[i];
struct wpabuf *ie;
- if (os_memcmp(p2p_group_get_interface_addr(g),
- group_bssid, ETH_ALEN) != 0)
+ if (!ether_addr_equal(p2p_group_get_interface_addr(g),
+ group_bssid))
continue;
ie = p2p_group_get_wfd_ie(g);
if (ie) {