From 3e96c89d1a5cef2e7becdf4d4e137c0e0d1b47d7 Mon Sep 17 00:00:00 2001 From: Qun Zhang Date: Tue, 20 Aug 2019 14:55:22 +0800 Subject: [PATCH] qcacld-3.0: Update SAE frame session id to avoid using invalid id 0 In current SAE implementation, lim_process_sae_auth_frame() and lim_process_sae_preauth_frame() all pass parameter session id 0 to lim_send_sme_mgmt_frame_ind(). In some test case, once vdev id 0 is removed, hdd_indicate_mgmt_frame() can not get adapter through vdev id 0, then SAE frame will not forward to supplicant. Update SAE frame session id to make sure at least one adapter can be found. Once adapter is available, __hdd_indicate_mgmt_frame() can get the expected interface through destination mac address. Change-Id: I3e8f430c4760448c6cc8dab9464979371de86118 CRs-Fixed: 2507342 --- core/mac/src/pe/lim/lim_process_auth_frame.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/mac/src/pe/lim/lim_process_auth_frame.c b/core/mac/src/pe/lim/lim_process_auth_frame.c index be14fd58448a..929b79851455 100644 --- a/core/mac/src/pe/lim/lim_process_auth_frame.c +++ b/core/mac/src/pe/lim/lim_process_auth_frame.c @@ -405,7 +405,8 @@ static void lim_process_sae_auth_frame(struct mac_context *mac_ctx, lim_send_sme_mgmt_frame_ind(mac_ctx, mac_hdr->fc.subType, (uint8_t *)mac_hdr, - frame_len + sizeof(tSirMacMgmtHdr), 0, + frame_len + sizeof(tSirMacMgmtHdr), + pe_session->smeSessionId, WMA_GET_RX_CH(rx_pkt_info), pe_session, WMA_GET_RX_RSSI_NORMALIZED(rx_pkt_info), rx_flags); @@ -1640,7 +1641,8 @@ bool lim_process_sae_preauth_frame(struct mac_context *mac, uint8_t *rx_pkt) lim_send_sme_mgmt_frame_ind(mac, dot11_hdr->fc.subType, (uint8_t *)dot11_hdr, - frm_len + sizeof(tSirMacMgmtHdr), 0, + frm_len + sizeof(tSirMacMgmtHdr), + SME_SESSION_ID_ANY, WMA_GET_RX_CH(rx_pkt), NULL, WMA_GET_RX_RSSI_NORMALIZED(rx_pkt), RXMGMT_FLAG_NONE);