Revert "[wpa_supplicant] cumilative patch from commit 3a5d1a7e6"
Revert submission 26533062-Supplicant_merge_June24
Reason for revert: https://b.corp.google.com/issues/349780869
Reverted changes: /q/submissionid:26533062-Supplicant_merge_June24
Change-Id: I4a7a5b8ccb6b4822353bacc29649587cd5a3cb80
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 81e11e7..cd94b64 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -295,7 +295,8 @@
if (ssid->bssid_set || new_ssid->bssid_set) {
if (ssid->bssid_set != new_ssid->bssid_set)
continue;
- if (!ether_addr_equal(ssid->bssid, new_ssid->bssid))
+ if (os_memcmp(ssid->bssid, new_ssid->bssid, ETH_ALEN) !=
+ 0)
continue;
}
@@ -1061,7 +1062,7 @@
*/
#ifndef CONFIG_P2P
dl_list_for_each(bss, &wpa_s->bss, struct wpa_bss, list) {
- if (!ether_addr_equal(bssid, bss->bssid))
+ if (os_memcmp(bssid, bss->bssid, ETH_ALEN) != 0)
continue;
os_free(ssid->ssid);
@@ -1811,7 +1812,7 @@
}
if (!ret && ssid->bssid_set &&
- ether_addr_equal(ssid->bssid, bss->bssid)) {
+ os_memcmp(ssid->bssid, bss->bssid, ETH_ALEN) == 0) {
/* allow wildcard SSID due to hardcoded BSSID match */
ret = 1;
}
@@ -1850,11 +1851,11 @@
const u8 *sel_uuid)
{
if (!ap->pbc_active ||
- ether_addr_equal(selected->bssid, ap->bssid))
+ os_memcmp(selected->bssid, ap->bssid, ETH_ALEN) == 0)
return false;
if (!is_zero_ether_addr(ssid->bssid) &&
- !ether_addr_equal(ap->bssid, ssid->bssid)) {
+ os_memcmp(ap->bssid, ssid->bssid, ETH_ALEN) != 0) {
wpa_printf(MSG_DEBUG, "WPS: Ignore another BSS " MACSTR
" in active PBC mode due to local BSSID limitation",
MAC2STR(ap->bssid));
@@ -2942,7 +2943,7 @@
for (i = 0; i < wpa_s->num_wps_ap; i++) {
struct wps_ap_info *ap = &wpa_s->wps_ap[i];
- if (ether_addr_equal(ap->bssid, bssid))
+ if (os_memcmp(ap->bssid, bssid, ETH_ALEN) == 0)
return ap;
}