commit 349a4f0ca50a6904500105cb8fb30e29d11d2c7f
author Arik Nemtsov <arik@wizery.com> Thu Oct 12 22:52:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Oct 12 22:52:45 2017 +0000
tree 0a9b12c271d6b4141afe85add699eb45c1f94bd0
parent a1f3ac5a6ec8e69f65cafeb3b7f57ca43302fa28
parent a7baabbbe719f153fa05ee3858cae1dff914f183

TDLS: Ignore incoming TDLS Setup Response retries
am: a7baabbbe7

Change-Id: Ic6ac2d6ab9fec1b55e60e6abba8ad8d419308204

src/rsn_supp/tdls.c

diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c
index 8cb19a2..73a1432 100644
--- a/src/rsn_supp/tdls.c
+++ b/src/rsn_supp/tdls.c
@@ -2150,6 +2150,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) {