diff options
| author | bings <bings@codeaurora.org> | 2019-06-13 13:06:52 +0800 |
|---|---|---|
| committer | bings <bings@codeaurora.org> | 2019-06-13 13:15:58 +0800 |
| commit | 5ec1870384fab90e076730bd2c047628d7816aa7 (patch) | |
| tree | ed31822773b5f92319b68b9610d14cb95de7a05a | |
| parent | 76561bc8756fdb9f4bd2c289e76931f82cc8aacc (diff) | |
qcacld-2.0: Fix build error in third party platform
Fix build error in third party platform.
Change-Id: Ida7aa766dd6dc524e843f9bd6655e1a2e719a229
CRs-fixed: 2470702
| -rw-r--r-- | CORE/CLD_TXRX/TXRX/ol_tx_send.c | 10 | ||||
| -rw-r--r-- | CORE/SAP/src/sapChSelect.c | 2 | ||||
| -rw-r--r-- | CORE/SME/src/sme_common/sme_Api.c | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/CORE/CLD_TXRX/TXRX/ol_tx_send.c b/CORE/CLD_TXRX/TXRX/ol_tx_send.c index 7823b3aa0f59..007dfd418ed3 100644 --- a/CORE/CLD_TXRX/TXRX/ol_tx_send.c +++ b/CORE/CLD_TXRX/TXRX/ol_tx_send.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved. * * Previously licensed under the ISC license by Qualcomm Atheros, Inc. * @@ -887,20 +887,20 @@ ol_tx_dump_group_credit_stats(ol_txrx_pdev_handle pdev) for (j = 0; j < OL_TX_MAX_TXQ_GROUPS; j++) { adf_os_spin_lock_bh(&pdev->grp_stat_spinlock); curr_credit = pdev->grp_stats.stats[curr_index].grp[j].credit; - if (!is_break) - old_credit = pdev->grp_stats.stats[old_index].grp[j].credit; mem_vdevs = pdev->grp_stats.stats[curr_index].grp[j].member_vdevs; adf_os_spin_unlock_bh(&pdev->grp_stat_spinlock); - if (!is_break) + if (!is_break) { + old_credit = pdev->grp_stats.stats[old_index].grp[j].credit; VOS_TRACE(VOS_MODULE_ID_TXRX, VOS_TRACE_LEVEL_ERROR, "%4d: %5d: %6d %6d %8x",curr_index, j, curr_credit, (curr_credit - old_credit), mem_vdevs); - else + } else { VOS_TRACE(VOS_MODULE_ID_TXRX, VOS_TRACE_LEVEL_ERROR, "%4d: %5d: %6d %6s %8x",curr_index, j, curr_credit, "NA", mem_vdevs); + } } if (is_break) diff --git a/CORE/SAP/src/sapChSelect.c b/CORE/SAP/src/sapChSelect.c index 1711e62fcb17..cfae9d0ce4bd 100644 --- a/CORE/SAP/src/sapChSelect.c +++ b/CORE/SAP/src/sapChSelect.c @@ -1992,6 +1992,7 @@ void sapComputeSpectWeight( tSapChSelSpectInfo* pSpectInfoParams, tSapSpectChInfo *pSpectChStartAddr = pSpectInfoParams->pSpectCh; tSapSpectChInfo *pSpectChEndAddr = pSpectInfoParams->pSpectCh + pSpectInfoParams->numSpectChans; + tSapSpectChInfo *pExtSpectCh = NULL; pBeaconStruct = vos_mem_malloc(sizeof(tSirProbeRespBeacon)); if ( NULL == pBeaconStruct ) @@ -2069,7 +2070,6 @@ void sapComputeSpectWeight( tSapChSelSpectInfo* pSpectInfoParams, case eHT_CHANNEL_WIDTH_40MHZ: //HT40 switch( secondaryChannelOffset) { - tSapSpectChInfo *pExtSpectCh = NULL; case PHY_DOUBLE_CHANNEL_LOW_PRIMARY: // Above the Primary Channel pExtSpectCh = (pSpectCh + 1); if( pExtSpectCh != NULL && diff --git a/CORE/SME/src/sme_common/sme_Api.c b/CORE/SME/src/sme_common/sme_Api.c index eb098a1ee997..42d9d52c80fd 100644 --- a/CORE/SME/src/sme_common/sme_Api.c +++ b/CORE/SME/src/sme_common/sme_Api.c @@ -9957,7 +9957,6 @@ eHalStatus sme_WakeReasonIndCallback (tHalHandle hHal, void* pMsg) eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t dB, tHalHandle hal) { - vos_msg_t msg; eHalStatus status; tSmeCmd *set_max_tx_pwr_per_band; tpAniSirGlobal mac_ctx = PMAC_STRUCT(hal); @@ -9972,9 +9971,6 @@ eHalStatus sme_SetMaxTxPowerPerBand(eCsrBand band, v_S7_t dB, FL("band : %d power %d dB"), band, dB); - MTRACE(vos_trace(VOS_MODULE_ID_SME, - TRACE_CODE_SME_TX_WDA_MSG, NO_SESSION, msg.type)); - status = sme_AcquireGlobalLock(&mac_ctx->sme); if (HAL_STATUS_SUCCESS(status)) { set_max_tx_pwr_per_band = csrGetCommandBuffer(mac_ctx); |