diff options
| author | Varun Reddy Yeturu <varunreddy.yeturu@codeaurora.org> | 2017-04-05 16:09:50 -0700 |
|---|---|---|
| committer | Sandeep Puligilla <spuligil@codeaurora.org> | 2017-04-06 18:07:15 -0700 |
| commit | 38d01bc123dafd26bb9b8c45048e2470b7e39d17 (patch) | |
| tree | e171b84316086f17417105b424eb69952ca3796f | |
| parent | 7ab99afcd27395be7eb2bab6f6fdffa79f08a696 (diff) | |
qcacld-3.0: Enable 2.4GHz LDPC only if allowed
Check for the user configuration for 2.4GHz LDPC setting
and send down the self capability to firmware in vdev start
request.
Change-Id: Ib507d498afca44cd1916eb881c3d5791f6e69179
CRs-Fixed: 2029667
| -rw-r--r-- | core/mac/src/pe/lim/lim_send_messages.c | 9 | ||||
| -rw-r--r-- | core/mac/src/pe/lim/lim_utils.c | 11 |
2 files changed, 13 insertions, 7 deletions
diff --git a/core/mac/src/pe/lim/lim_send_messages.c b/core/mac/src/pe/lim/lim_send_messages.c index fa8612d04a78..7e77475a3228 100644 --- a/core/mac/src/pe/lim/lim_send_messages.c +++ b/core/mac/src/pe/lim/lim_send_messages.c @@ -265,6 +265,9 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, is_current_hwmode_dbs = wma_is_current_hwmode_dbs(); pChnlParams->rx_ldpc = lim_get_rx_ldpc(pMac, chnlNumber, is_current_hwmode_dbs); + if (CDS_IS_CHANNEL_24GHZ(chnlNumber)) + pChnlParams->rx_ldpc = pChnlParams->rx_ldpc && + pMac->roam.configParam.rx_ldpc_support_for_2g; /* we need to defer the message until we * get the response back from WMA */ @@ -273,9 +276,9 @@ tSirRetStatus lim_send_switch_chnl_params(tpAniSirGlobal pMac, msgQ.reserved = 0; msgQ.bodyptr = pChnlParams; msgQ.bodyval = 0; - pe_debug("Sending CH_SWITCH_REQ, ch_width %d, ch_num %d, maxTxPower %d", - pChnlParams->ch_width, - pChnlParams->channelNumber, pChnlParams->maxTxPower); + pe_debug("CH_SWITCH_REQ, ch_width %d, ch_num %d, max_tx_pwr %d, ldpc %d", + pChnlParams->ch_width, pChnlParams->channelNumber, + pChnlParams->maxTxPower, pChnlParams->rx_ldpc); MTRACE(mac_trace_msg_tx(pMac, peSessionId, msgQ.type)); if (eSIR_SUCCESS != wma_post_ctrl_msg(pMac, &msgQ)) { qdf_mem_free(pChnlParams); diff --git a/core/mac/src/pe/lim/lim_utils.c b/core/mac/src/pe/lim/lim_utils.c index f0da8257d164..64e81043db33 100644 --- a/core/mac/src/pe/lim/lim_utils.c +++ b/core/mac/src/pe/lim/lim_utils.c @@ -6344,16 +6344,19 @@ bool lim_get_rx_ldpc(tpAniSirGlobal mac_ctx, uint8_t ch, uint8_t is_hw_mode_dbs) { enum hw_mode_dbs_capab hw_mode_to_use; + bool ret_val; hw_mode_to_use = is_hw_mode_dbs ? HW_MODE_DBS : HW_MODE_DBS_NONE; - pe_debug("ch: %d rx_ldpc: %d hw_mode_to_use: %d", - ch, is_hw_mode_dbs, hw_mode_to_use); if (mac_ctx->roam.configParam.rx_ldpc_enable && wma_is_rx_ldpc_supported_for_channel( CDS_CHANNEL_NUM(ch), hw_mode_to_use)) - return true; + ret_val = true; else - return false; + ret_val = false; + pe_debug("ch: %d rx_ldpc: %d hw_mode_to_use: %d", + ch, ret_val, hw_mode_to_use); + + return ret_val; } /** |