From 0acd0c4df46df4f4215a581eb559a52e5d385a5e Mon Sep 17 00:00:00 2001 From: Abhishek Singh Date: Thu, 22 Aug 2019 15:49:33 +0530 Subject: [PATCH] qcacld-3.0: Fill proper vdev id in add bss req bss_id Add bss req bss_id vdev_id is not set to vdev id and thus if vdev start fails, wma_remove_peer_on_add_bss_failure try to delete peer from vdev id 0 instead of proper vdev_id. Fix is to set proper vdev id to add bss req bss_id. Change-Id: I9bbe7daf03fe2872d7026872e8dd7818840f9345 CRs-Fixed: 2513007 --- core/mac/src/pe/lim/lim_assoc_utils.c | 2 ++ core/mac/src/pe/lim/lim_ft.c | 1 + core/mac/src/pe/lim/lim_process_mlm_req_messages.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/core/mac/src/pe/lim/lim_assoc_utils.c b/core/mac/src/pe/lim/lim_assoc_utils.c index cd9ad2ae5b08..5fb1f4542042 100644 --- a/core/mac/src/pe/lim/lim_assoc_utils.c +++ b/core/mac/src/pe/lim/lim_assoc_utils.c @@ -3636,6 +3636,7 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp /* Update PE session ID */ pAddBssParams->sessionId = pe_session->peSessionId; + pAddBssParams->bss_idx = pe_session->smeSessionId; pAddBssParams->beaconInterval = bssDescription->beaconInterval; @@ -4457,6 +4458,7 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac, uint8_t updat pAddBssParams->staContext.smesessionId = pe_session->smeSessionId; pAddBssParams->staContext.sessionId = pe_session->peSessionId; pAddBssParams->sessionId = pe_session->peSessionId; + pAddBssParams->bss_idx = pe_session->smeSessionId; pAddBssParams->halPersona = (uint8_t)pe_session->opmode; diff --git a/core/mac/src/pe/lim/lim_ft.c b/core/mac/src/pe/lim/lim_ft.c index 22f6c0130f86..120c992803e3 100644 --- a/core/mac/src/pe/lim/lim_ft.c +++ b/core/mac/src/pe/lim/lim_ft.c @@ -417,6 +417,7 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac, pAddBssParams->staContext.sessionId = ft_session->peSessionId; pAddBssParams->staContext.smesessionId = ft_session->smeSessionId; pAddBssParams->sessionId = ft_session->peSessionId; + pAddBssParams->bss_idx = ft_session->smeSessionId; /* Set a new state for MLME */ if (!lim_is_roam_synch_in_progress(ft_session)) { diff --git a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c index 8fd06206f2bc..dfa14f36c46b 100644 --- a/core/mac/src/pe/lim/lim_process_mlm_req_messages.c +++ b/core/mac/src/pe/lim/lim_process_mlm_req_messages.c @@ -372,6 +372,8 @@ lim_mlm_add_bss(struct mac_context *mac_ctx, /* Update PE sessionId */ addbss_param->sessionId = mlm_start_req->sessionId; + addbss_param->bss_idx = session->smeSessionId; + /* Send the SSID to HAL to enable SSID matching for IBSS */ addbss_param->ssId.length = mlm_start_req->ssId.length;