commit 3a5b4419399ea11d1517aee557dd5eca7a10b4fc
author Vinita S. Maloo <vmaloo@codeaurora.org> Tue May 19 17:43:22 2020 +0530
committer Sunil Ravi <sunilravi@google.com> Thu Jun 25 00:13:29 2020 +0000
tree 887b18bc40180ca2cf5d553530333977b7504a74
parent 007d736cc039f6f3143547eddda6aed3c1bca1c0

nl80211: Do not send FILS ERP sequence number without rRK

FILS ERP cannot be used without rRK, so include these attributes only
together.

Bug: 156130528
Test: Manual - Basic wifi sanity

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
Signed-off-by: Sunil Ravi <sunilravi@google.com>
Change-Id: I17cdad4a56fc934244fab0f1c639ad4c2f0e5ff0

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,