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/src/p2p/p2p_group.c b/src/p2p/p2p_group.c
index c036f92..aa18af6 100644
--- a/src/p2p/p2p_group.c
+++ b/src/p2p/p2p_group.c
@@ -579,7 +579,7 @@
m = group->members;
prev = NULL;
while (m) {
- if (ether_addr_equal(m->addr, addr))
+ if (os_memcmp(m->addr, addr, ETH_ALEN) == 0)
break;
prev = m;
m = m->next;
@@ -785,11 +785,11 @@
if (!msg.device_id)
return 1; /* No filter on Device ID */
- if (ether_addr_equal(msg.device_id, group->p2p->cfg->dev_addr))
+ if (os_memcmp(msg.device_id, group->p2p->cfg->dev_addr, ETH_ALEN) == 0)
return 1; /* Match with our P2P Device Address */
for (m = group->members; m; m = m->next) {
- if (ether_addr_equal(msg.device_id, m->dev_addr))
+ if (os_memcmp(msg.device_id, m->dev_addr, ETH_ALEN) == 0)
return 1; /* Match with group client P2P Device Address */
}
@@ -844,7 +844,7 @@
struct p2p_group_member *m;
for (m = group->members; m; m = m->next) {
- if (ether_addr_equal(dev_id, m->dev_addr))
+ if (os_memcmp(dev_id, m->dev_addr, ETH_ALEN) == 0)
return m;
}
@@ -872,7 +872,7 @@
struct p2p_group_member *m;
for (m = group->members; m; m = m->next) {
- if (ether_addr_equal(interface_addr, m->addr))
+ if (os_memcmp(interface_addr, m->addr, ETH_ALEN) == 0)
return m;
}
@@ -1038,7 +1038,7 @@
struct p2p_group_member *m;
for (m = group->members; m; m = m->next) {
- if (ether_addr_equal(m->dev_addr, dev_addr))
+ if (os_memcmp(m->dev_addr, dev_addr, ETH_ALEN) == 0)
return 1;
}
@@ -1051,7 +1051,7 @@
{
if (group_id_len != ETH_ALEN + group->cfg->ssid_len)
return 0;
- if (!ether_addr_equal(group_id, group->p2p->cfg->dev_addr))
+ if (os_memcmp(group_id, group->p2p->cfg->dev_addr, ETH_ALEN) != 0)
return 0;
return os_memcmp(group_id + ETH_ALEN, group->cfg->ssid,
group->cfg->ssid_len) == 0;