commit 20ebcddc36e67ba5147dccab40c56e48a10d25f9
author Vinita S. Maloo <vmaloo@codeaurora.org> Wed Jul 29 01:56:21 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 29 01:56:21 2020 +0000
tree 887b18bc40180ca2cf5d553530333977b7504a74
parent ba0ae7d745e575bff29a396a6c3478c0700ae3df
parent 3a5b4419399ea11d1517aee557dd5eca7a10b4fc

nl80211: Do not send FILS ERP sequence number without rRK am: 3a5b441939

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wpa_supplicant_8/+/11990402

Change-Id: I0b9dc7f9449f83a6ad76ccfdda8369395e80e9dc

src/drivers/driver_nl80211.c

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 8be593a..51674f0 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -5693,13 +5693,13 @@
 			return -1;
 	}
 
-	wpa_printf(MSG_DEBUG, "  * FILS ERP next seq %u",
-		   params->fils_erp_next_seq_num);
-	if (nla_put_u16(msg, NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM,
-			params->fils_erp_next_seq_num))
-		return -1;
-
 	if (params->fils_erp_rrk_len) {
+		wpa_printf(MSG_DEBUG, "  * FILS ERP next seq %u",
+			   params->fils_erp_next_seq_num);
+		if (nla_put_u16(msg, NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM,
+				params->fils_erp_next_seq_num))
+			return -1;
+
 		wpa_printf(MSG_DEBUG, "  * FILS ERP rRK (len=%lu)",
 			   (unsigned long) params->fils_erp_rrk_len);
 		if (nla_put(msg, NL80211_ATTR_FILS_ERP_RRK,