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
This commit is contained in:
Pragaspathi Thilagaraj
2020-09-16 12:42:12 +05:30
committed by snandini
parent 1c88796c77
commit efae9d0fd6

View File

@@ -1828,7 +1828,6 @@ static bool wmi_is_ft_akm(int akm,
break; break;
default: default:
wmi_debug("Unknown akm:%d", akm);
return false; 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 * authentication type, the other mode TLV's are nullified
* and only headers are filled. * and only headers are filled.
*/ */
if (akm != WMI_AUTH_NONE && if ((akm != WMI_AUTH_OPEN || roam_req->rso_ese_info.is_ese_assoc ||
(wmi_is_ft_akm(akm, roam_req) || wmi_is_ft_akm(akm, roam_req)) && akm != WMI_AUTH_NONE) {
roam_req->rso_ese_info.is_ese_assoc)) {
if (roam_req->rso_ese_info.is_ese_assoc) { if (roam_req->rso_ese_info.is_ese_assoc) {
/* Fill the length of 11i, 11r TLV as 0 */ /* Fill the length of 11i, 11r TLV as 0 */
WMITLV_SET_HDR(buf, WMITLV_TAG_ARRAY_STRUC, 0); WMITLV_SET_HDR(buf, WMITLV_TAG_ARRAY_STRUC, 0);