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/common/dpp_tcp.c b/src/common/dpp_tcp.c
index 2fad3e1..d226a8a 100644
--- a/src/common/dpp_tcp.c
+++ b/src/common/dpp_tcp.c
@@ -563,7 +563,7 @@
struct dpp_connection *conn;
dl_list_for_each(conn, &ctrl->conn, struct dpp_connection, list) {
- if (ether_addr_equal(src, conn->mac_addr))
+ if (os_memcmp(src, conn->mac_addr, ETH_ALEN) == 0)
return conn;
if ((type == DPP_PA_PKEX_EXCHANGE_RESP ||
type == DPP_PA_AUTHENTICATION_RESP) &&
@@ -661,7 +661,7 @@
struct dpp_connection *conn;
dl_list_for_each(conn, &ctrl->conn, struct dpp_connection, list) {
- if (ether_addr_equal(src, conn->mac_addr))
+ if (os_memcmp(src, conn->mac_addr, ETH_ALEN) == 0)
return conn;
}
@@ -2601,8 +2601,7 @@
}
-static void dpp_tcp_send_conn_status_msg(struct dpp_global *dpp,
- struct dpp_connection *conn,
+static void dpp_tcp_send_conn_status_msg(struct dpp_connection *conn,
enum dpp_status_error result,
const u8 *ssid, size_t ssid_len,
const char *channel_list)
@@ -2610,7 +2609,6 @@
struct dpp_authentication *auth = conn->auth;
int res;
struct wpabuf *msg;
- struct dpp_connection *c;
auth->conn_status_requested = 0;
@@ -2629,16 +2627,8 @@
return;
}
- /* conn might have been removed during the dpp_tcp_send_msg() call, so
- * need to check that it is still present before modifying it. */
- dl_list_for_each(c, &dpp->tcp_init, struct dpp_connection, list) {
- if (conn == c) {
- /* This exchange will be terminated in the TX status
- * handler */
- conn->on_tcp_tx_complete_remove = 1;
- break;
- }
- }
+ /* This exchange will be terminated in the TX status handler */
+ conn->on_tcp_tx_complete_remove = 1;
}
@@ -2651,7 +2641,7 @@
dl_list_for_each(conn, &dpp->tcp_init, struct dpp_connection, list) {
if (conn->auth && conn->auth->conn_status_requested) {
- dpp_tcp_send_conn_status_msg(dpp, conn, result, ssid,
+ dpp_tcp_send_conn_status_msg(conn, result, ssid,
ssid_len, channel_list);
break;
}