From 271784b734381f515eade5c69c9d8b8a140f69a0 Mon Sep 17 00:00:00 2001 From: Liangwei Dong Date: Tue, 19 Mar 2019 04:56:18 -0400 Subject: [PATCH] qcacld-3.0: Use correct struct type tSetBssKeyParams When CRYPTO_SET_KEY_CONVERGED enabled, the set bss key will use tSetBssKeyParams in wma_send_set_key_rsp. Change-Id: Ief0c822c637ac06dc241a682c060f19bb946fea2 CRs-Fixed: 2402889 --- core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c index d6d3381f875d..0a7c9bbc206a 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c @@ -2941,6 +2941,10 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx, result_status = (uint16_t)(((tpSetBssKeyParams)msg->bodyptr)->status); key_len = ((tpSetBssKeyParams)msg->bodyptr)->key[0].keyLength; + } else if (lim_is_set_key_req_converged()) { + result_status = + (uint16_t)(((tpSetBssKeyParams)msg->bodyptr)->status); + key_len = ((tpSetBssKeyParams)msg->bodyptr)->key[0].keyLength; } else { /* * BCAST key also uses tpSetStaKeyParams. @@ -2951,6 +2955,9 @@ void lim_process_mlm_set_bss_key_rsp(struct mac_context *mac_ctx, key_len = ((tpSetStaKeyParams)msg->bodyptr)->key[0].keyLength; } + pe_debug("limMlmState %d status %d key_len %d", + session_entry->limMlmState, result_status, key_len); + if (result_status == eSIR_SME_SUCCESS && key_len) set_key_cnf.key_len_nonzero = true; else