From efae9d0fd671cfee20e6961f27a48cecd28b920b Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Wed, 16 Sep 2020 12:42:12 +0530 Subject: [PATCH] qcacld-3.0: Fix roam scan mode tlv formation for secure connection Fix roam scan mode tlv formation for secure connection. 11i tlv is not filled due to wrong akm check in wmi_fill_rso_tlvs(). Fix the akm check in wmi_fill_rso_tlvs to fill the roam scan mode tlv properly. Change-Id: I59ec0e34139ac4a6d6e2bcc03e84ac695292b1f2 CRs-Fixed: 2778658 --- components/wmi/src/wmi_unified_roam_tlv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/components/wmi/src/wmi_unified_roam_tlv.c b/components/wmi/src/wmi_unified_roam_tlv.c index 81feb2a690..3f417b4ce9 100644 --- a/components/wmi/src/wmi_unified_roam_tlv.c +++ b/components/wmi/src/wmi_unified_roam_tlv.c @@ -1828,7 +1828,6 @@ static bool wmi_is_ft_akm(int akm, break; default: - wmi_debug("Unknown akm:%d", akm); return false; } @@ -2095,9 +2094,8 @@ wmi_fill_rso_tlvs(wmi_unified_t wmi_handle, uint8_t *buf, * authentication type, the other mode TLV's are nullified * and only headers are filled. */ - if (akm != WMI_AUTH_NONE && - (wmi_is_ft_akm(akm, roam_req) || - roam_req->rso_ese_info.is_ese_assoc)) { + if ((akm != WMI_AUTH_OPEN || roam_req->rso_ese_info.is_ese_assoc || + wmi_is_ft_akm(akm, roam_req)) && akm != WMI_AUTH_NONE) { if (roam_req->rso_ese_info.is_ese_assoc) { /* Fill the length of 11i, 11r TLV as 0 */ WMITLV_SET_HDR(buf, WMITLV_TAG_ARRAY_STRUC, 0);