wlan: ftm: Process WE_GET_TX_POWER and WE_GET_TX_RATE IOCTLs appropriately
For WE_GET_TX_POWER, currently driver requests tx power index value from FW
and uses it to calculate tx power value in dbm. Now in FW changes are done
to send directly power in dbm so that driver can return same value to USER.
For WE_GET_TX_RATE, currently driver requests current tx rate from FW. But
if USER requests tx rate just after setting tx rate(without sending any
data) then driver returns previously set tx rate rather than current rate.
Hence changes are done to return valid numbers to user for WE_GET_TX_POWER
and WE_GET_TX_RATE IOCTLs.
Change-Id: I228dc15c74a872d3cefd7e708085e96e72c4422e
CRs-Fixed: 934985
diff --git a/CORE/HDD/src/wlan_hdd_ftm.c b/CORE/HDD/src/wlan_hdd_ftm.c
index 6e4bd0d..62059f9 100644
--- a/CORE/HDD/src/wlan_hdd_ftm.c
+++ b/CORE/HDD/src/wlan_hdd_ftm.c
@@ -4542,7 +4542,7 @@
status = VOS_STATUS_E_FAILURE;
goto done;
}
- *pTxPwr = ((((pMsgBody->GetTxPowerReport.pwrTemplateIndex & 0x1F) + 4)*50)/100);
+ *pTxPwr = pMsgBody->GetTxPowerReport.pwrTemplateIndex;
done:
@@ -4565,11 +4565,8 @@
static VOS_STATUS wlan_ftm_priv_get_txrate(hdd_adapter_t *pAdapter,char *pTxRate)
{
- uPttMsgs *pMsgBody;
VOS_STATUS status;
- v_U16_t rate_index,ii;
- long ret;
-
+ v_U16_t ii;
hdd_context_t *pHddCtx = (hdd_context_t *)pAdapter->pHddCtx;
if (pHddCtx->ftm.ftm_state != WLAN_FTM_STARTED)
@@ -4579,51 +4576,8 @@
return VOS_STATUS_E_FAILURE;
}
- if (NULL == pMsgBuf)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s:pMsgBuf is NULL", __func__);
- return VOS_STATUS_E_NOMEM;
- }
- vos_mem_set(pMsgBuf, sizeof(tPttMsgbuffer), 0);
- init_completion(&pHddCtx->ftm.ftm_comp_var);
- pMsgBuf->msgId = PTT_MSG_GET_TX_POWER_REPORT;
- pMsgBuf->msgBodyLength = sizeof(tMsgPttGetTxPowerReport) + PTT_HEADER_LENGTH;
-
- pMsgBody = &pMsgBuf->msgBody;
-
- status = wlan_ftm_postmsg((v_U8_t*)pMsgBuf,pMsgBuf->msgBodyLength);
-
- if (status != VOS_STATUS_SUCCESS)
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s:wlan_ftm_postmsg failed", __func__);
- status = VOS_STATUS_E_FAILURE;
- goto done;
- }
- ret = wait_for_completion_interruptible_timeout(&pHddCtx->ftm.ftm_comp_var,
- msecs_to_jiffies(WLAN_FTM_COMMAND_TIME_OUT));
- if (0 >= ret )
- {
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
- FL("wait on ftm_comp_var failed %ld"), ret);
- }
-
- if (pMsgBuf->msgResponse == PTT_STATUS_SUCCESS) {
-
- rate_index = pMsgBody->GetTxPowerReport.rate;
- }
- else {
- /*Return the default rate*/
- //rate_index = HAL_PHY_RATE_11A_6_MBPS;
- VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_FATAL,
- "%s: PTT_MSG_GET_TX_POWER_REPORT failed", __func__);
- status = VOS_STATUS_E_FAILURE;
- goto done;
- }
-
for(ii = 0; ii < SIZE_OF_TABLE(rateName_rateIndex_tbl); ii++) {
- if(rateName_rateIndex_tbl[ii].rate_index == rate_index)
+ if(rateName_rateIndex_tbl[ii].rate_index == ftm_status.frameParams.rate)
break;
}
if(ii >= SIZE_OF_TABLE(rateName_rateIndex_tbl))
@@ -4633,8 +4587,8 @@
goto done;
}
strlcpy(pTxRate,rateName_rateIndex_tbl[ii].rate_str, WE_FTM_MAX_STR_LEN);
-done:
+done:
return status;
}