Revert "[wpa_supplicant] cumilative patch from commit 4b755c967"
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: I6c9b7a4323fa7edde47617da6c1e0d8f6e6d5101
diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index 65960b7..8a75091 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -161,8 +161,6 @@
int chan_switch_enabled;
int mld_link_id;
- bool disc_resp_rcvd;
- bool setup_req_rcvd;
};
@@ -1571,8 +1569,9 @@
} else {
int i;
- for_each_link(sm->mlo.valid_links, i) {
- if (ether_addr_equal(lnkid->bssid,
+ for (i = 0; i < MAX_NUM_MLD_LINKS; i++) {
+ if ((sm->mlo.valid_links & BIT(i)) &&
+ ether_addr_equal(lnkid->bssid,
sm->mlo.links[i].bssid)) {
*link_id = i;
break;
@@ -2869,12 +2868,6 @@
return 0;
}
- if (sm->mlo.valid_links && !peer->disc_resp_rcvd) {
- wpa_printf(MSG_DEBUG,
- "TDLS: MLO STA connection - defer the setup request since Discovery Resp not yet received");
- peer->setup_req_rcvd = true;
- return 0;
- }
peer->initiator = 1;
/* add the peer to the driver as a "setup in progress" peer */
@@ -3243,13 +3236,6 @@
wpa_printf(MSG_DEBUG, "TDLS: Link identifier BSS: " MACSTR
" , link id: %u", MAC2STR(lnkid->bssid), link_id);
- peer->disc_resp_rcvd = true;
- if (peer->setup_req_rcvd) {
- peer->setup_req_rcvd = false;
- wpa_printf(MSG_DEBUG, "TDLS: Process the deferred TDLS start");
- return wpa_tdls_start(sm, addr);
- }
-
return 0;
}