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/fst/fst_group.c b/src/fst/fst_group.c
index 255d0fd..61c7299 100644
--- a/src/fst/fst_group.c
+++ b/src/fst/fst_group.c
@@ -364,8 +364,7 @@
cur_mbie, this_band_id);
if (!this_peer_addr)
continue;
- if (os_memcmp(this_peer_addr, peer_addr, ETH_ALEN) ==
- 0) {
+ if (ether_addr_equal(this_peer_addr, peer_addr)) {
os_memcpy(other_peer_addr, cur_peer_addr,
ETH_ALEN);
return other_iface;
diff --git a/src/fst/fst_iface.c b/src/fst/fst_iface.c
index 90c5fc0..96b2847 100644
--- a/src/fst/fst_iface.c
+++ b/src/fst/fst_iface.c
@@ -56,7 +56,7 @@
const u8 *a = fst_iface_get_peer_first(iface, &ctx, mb_only);
for (; a != NULL; a = fst_iface_get_peer_next(iface, &ctx, mb_only))
- if (os_memcmp(addr, a, ETH_ALEN) == 0)
+ if (ether_addr_equal(addr, a))
return true;
return false;
diff --git a/src/fst/fst_session.c b/src/fst/fst_session.c
index e42a85c..49886ff 100644
--- a/src/fst/fst_session.c
+++ b/src/fst/fst_session.c
@@ -238,10 +238,8 @@
foreach_fst_session(s) {
if (s->group == g &&
- (os_memcmp(s->data.old_peer_addr, peer_addr,
- ETH_ALEN) == 0 ||
- os_memcmp(s->data.new_peer_addr, peer_addr,
- ETH_ALEN) == 0) &&
+ (ether_addr_equal(s->data.old_peer_addr, peer_addr) ||
+ ether_addr_equal(s->data.new_peer_addr, peer_addr)) &&
fst_session_is_in_progress(s))
return s;
}