commit 5ef4ee48b530abc0a9fd03061b61b2ebdb7c2151
author Arik Nemtsov <arik@wizery.com> Thu Oct 12 23:02:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 23:02:59 2017 +0000
tree fe5816e3884c6bc90ebb0ca4511b29365d5208db
parent ef83464bec7f6c9787d47f4b3a9bc581d4db2804
parent 63682ab052cad69e1217693a4fb83249141fa2fa

TDLS: Ignore incoming TDLS Setup Response retries am: ffe5bfab29 am: 5941ac2aa0
am: 63682ab052

Change-Id: I75573cf0a5c5da51ec82490e5ced99849e249cb2

src/rsn_supp/tdls.c

diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index 6b1df71..34e3180 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -2169,6 +2169,14 @@
 			   "ignore TPK M2 from " MACSTR, MAC2STR(src_addr));
 		return -1;
 	}
+
+	if (peer->tpk_success) {
+		wpa_printf(MSG_INFO, "TDLS: Ignore incoming TPK M2 retry, from "
+			   MACSTR " as TPK M3 was already sent",
+			   MAC2STR(src_addr));
+		return 0;
+	}
+
 	wpa_tdls_tpk_retry_timeout_cancel(sm, peer, WLAN_TDLS_SETUP_REQUEST);
 
 	if (len < 3 + 2 + 1) {