diff --git a/core/sme/inc/csr_link_list.h b/core/sme/inc/csr_link_list.h index 42047c39696d..af8ab8ddfc54 100644 --- a/core/sme/inc/csr_link_list.h +++ b/core/sme/inc/csr_link_list.h @@ -48,7 +48,6 @@ typedef struct tagDblLinkList { tListElem ListHead; qdf_mutex_t Lock; uint32_t Count; - hdd_handle_t hHdd; tListFlag Flag; /*command debugging */ uint32_t cmdTimeoutDuration; /* command timeout duration */ @@ -73,7 +72,7 @@ typedef struct tagDblLinkList { #define csrIsListEmpty(pHead) ((pHead)->next == (pHead)) uint32_t csr_ll_count(tDblLinkList *pList); -QDF_STATUS csr_ll_open(hdd_handle_t hHdd, tDblLinkList *pList); +QDF_STATUS csr_ll_open(tDblLinkList *pList); void csr_ll_close(tDblLinkList *pList); void csr_ll_lock(tDblLinkList *pList); void csr_ll_unlock(tDblLinkList *pList); diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 1dee920dc176..faeed94ecea0 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -293,7 +293,7 @@ static QDF_STATUS init_sme_cmd_list(tpAniSirGlobal pMac) pMac->sme.totalSmeCmd = SME_TOTAL_COMMAND; - status = csr_ll_open(pMac->hHdd, &pMac->sme.smeCmdFreeList); + status = csr_ll_open(&pMac->sme.smeCmdFreeList); if (!QDF_IS_STATUS_SUCCESS(status)) goto end; diff --git a/core/sme/src/csr/csr_api_roam.c b/core/sme/src/csr/csr_api_roam.c index 1d7d0830ce2b..e40fc8d3a37a 100644 --- a/core/sme/src/csr/csr_api_roam.c +++ b/core/sme/src/csr/csr_api_roam.c @@ -543,11 +543,11 @@ static QDF_STATUS csr_open_stats_ll(struct sAniSirGlobal *mac_ctx) { QDF_STATUS status; - status = csr_ll_open(mac_ctx->hHdd, &mac_ctx->roam.statsClientReqList); + status = csr_ll_open(&mac_ctx->roam.statsClientReqList); if (QDF_IS_STATUS_ERROR(status)) return status; - return csr_ll_open(mac_ctx->hHdd, &mac_ctx->roam.peStatsReqList); + return csr_ll_open(&mac_ctx->roam.peStatsReqList); } static void csr_close_stats_ll(struct sAniSirGlobal *mac_ctx) @@ -3989,7 +3989,7 @@ static void csr_roam_remove_duplicate_pending_cmd_from_list( tDblLinkList local_list; qdf_mem_zero(&local_list, sizeof(tDblLinkList)); - if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(mac_ctx->hHdd, &local_list))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(&local_list))) { sme_err("failed to open list"); return; } diff --git a/core/sme/src/csr/csr_api_scan.c b/core/sme/src/csr/csr_api_scan.c index 2c3848b8aa25..85a032bcf7b5 100644 --- a/core/sme/src/csr/csr_api_scan.c +++ b/core/sme/src/csr/csr_api_scan.c @@ -118,8 +118,8 @@ static QDF_STATUS csr_ll_scan_purge_result(tpAniSirGlobal pMac, QDF_STATUS csr_scan_open(tpAniSirGlobal mac_ctx) { - csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.channelPowerInfoList24); - csr_ll_open(mac_ctx->hHdd, &mac_ctx->scan.channelPowerInfoList5G); + csr_ll_open(&mac_ctx->scan.channelPowerInfoList24); + csr_ll_open(&mac_ctx->scan.channelPowerInfoList5G); return QDF_STATUS_SUCCESS; } @@ -1841,7 +1841,7 @@ QDF_STATUS csr_remove_nonscan_cmd_from_pending_list(tpAniSirGlobal pMac, QDF_STATUS status = QDF_STATUS_E_FAILURE; qdf_mem_zero(&localList, sizeof(tDblLinkList)); - if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(pMac->hHdd, &localList))) { + if (!QDF_IS_STATUS_SUCCESS(csr_ll_open(&localList))) { sme_err("failed to open list"); return status; } @@ -2858,7 +2858,7 @@ QDF_STATUS csr_scan_get_result(tpAniSirGlobal mac_ctx, goto error; } - csr_ll_open(mac_ctx->hHdd, &ret_list->List); + csr_ll_open(&ret_list->List); ret_list->pCurEntry = NULL; status = csr_parse_scan_list(mac_ctx, ret_list, list); diff --git a/core/sme/src/csr/csr_link_list.c b/core/sme/src/csr/csr_link_list.c index 968abcdc4d5a..746e5c2e3deb 100644 --- a/core/sme/src/csr/csr_link_list.c +++ b/core/sme/src/csr/csr_link_list.c @@ -203,7 +203,7 @@ bool csr_ll_find_entry(tDblLinkList *pList, tListElem *pEntryToFind) return fFound; } -QDF_STATUS csr_ll_open(hdd_handle_t hHdd, tDblLinkList *pList) +QDF_STATUS csr_ll_open(tDblLinkList *pList) { QDF_STATUS status = QDF_STATUS_SUCCESS; QDF_STATUS qdf_status; @@ -222,7 +222,6 @@ QDF_STATUS csr_ll_open(hdd_handle_t hHdd, tDblLinkList *pList) if (QDF_IS_STATUS_SUCCESS(qdf_status)) { csr_list_init(&pList->ListHead); pList->Flag = LIST_FLAG_OPEN; - pList->hHdd = hHdd; } else status = QDF_STATUS_E_FAILURE; } diff --git a/core/sme/src/csr/csr_neighbor_roam.c b/core/sme/src/csr/csr_neighbor_roam.c index 0994cda1abf7..30c5d2c0f252 100644 --- a/core/sme/src/csr/csr_neighbor_roam.c +++ b/core/sme/src/csr/csr_neighbor_roam.c @@ -1206,7 +1206,7 @@ static QDF_STATUS csr_neighbor_roam_init11r_assoc_info(tpAniSirGlobal pMac) sizeof(tCsrNeighborReportBssInfo) * MAX_BSS_IN_NEIGHBOR_RPT); - status = csr_ll_open(pMac->hHdd, &pFTRoamInfo->preAuthDoneList); + status = csr_ll_open(&pFTRoamInfo->preAuthDoneList); if (QDF_STATUS_SUCCESS != status) { sme_err("LL Open of preauth done AP List failed"); return QDF_STATUS_E_RESOURCES; @@ -1326,7 +1326,7 @@ QDF_STATUS csr_neighbor_roam_init(tpAniSirGlobal pMac, uint8_t sessionId) qdf_mem_set(&pNeighborRoamInfo->prevConnProfile, sizeof(tCsrRoamConnectedProfile), 0); - status = csr_ll_open(pMac->hHdd, &pNeighborRoamInfo->roamableAPList); + status = csr_ll_open(&pNeighborRoamInfo->roamableAPList); if (QDF_STATUS_SUCCESS != status) { sme_err("LL Open of roam able AP List failed"); qdf_mem_free(pNeighborRoamInfo->cfgParams.channelInfo. diff --git a/core/sme/src/qos/sme_qos.c b/core/sme/src/qos/sme_qos.c index 692a096887aa..7e0d416fc4d6 100644 --- a/core/sme/src/qos/sme_qos.c +++ b/core/sme/src/qos/sme_qos.c @@ -510,7 +510,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) sme_qos_cb.nextFlowId = SME_QOS_MIN_FLOW_ID; sme_qos_cb.nextDialogToken = SME_QOS_MIN_DIALOG_TOKEN; /* init flow list */ - status = csr_ll_open(pMac->hHdd, &sme_qos_cb.flow_list); + status = csr_ll_open(&sme_qos_cb.flow_list); if (!QDF_IS_STATUS_SUCCESS(status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: cannot initialize Flow List", @@ -524,8 +524,7 @@ QDF_STATUS sme_qos_open(tpAniSirGlobal pMac) /* initialize the session's per-AC information */ sme_qos_init_a_cs(pMac, sessionId); /* initialize the session's buffered command list */ - status = csr_ll_open(pMac->hHdd, &pSession-> - bufferedCommandList); + status = csr_ll_open(&pSession->bufferedCommandList); if (!QDF_IS_STATUS_SUCCESS(status)) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "%s: %d: cannot initialize cmd list for session %d", diff --git a/core/sme/src/rrm/sme_rrm.c b/core/sme/src/rrm/sme_rrm.c index 2fdfbd15a836..34b3110e599f 100644 --- a/core/sme/src/rrm/sme_rrm.c +++ b/core/sme/src/rrm/sme_rrm.c @@ -1409,8 +1409,7 @@ QDF_STATUS rrm_open(tpAniSirGlobal pMac) pSmeRrmContext->neighborReqControlInfo.isNeighborRspPending = false; - qdf_ret_status = - csr_ll_open(pMac->hHdd, &pSmeRrmContext->neighborReportCache); + qdf_ret_status = csr_ll_open(&pSmeRrmContext->neighborReportCache); if (QDF_STATUS_SUCCESS != qdf_ret_status) { QDF_TRACE(QDF_MODULE_ID_SME, QDF_TRACE_LEVEL_ERROR, "rrm_open: Fail to open neighbor cache result");