diff options
| author | Houston Hoffman <hhoffman@codeaurora.org> | 2016-06-14 14:44:48 -0700 |
|---|---|---|
| committer | Houston Hoffman <hhoffman@codeaurora.org> | 2016-06-14 14:55:16 -0700 |
| commit | 5649db91a8501cf316ab2c8b61704020ca5de553 (patch) | |
| tree | 1c4346656bc004132a6c81798eb7d04ebea3fc80 | |
| parent | 7579337abf2d6a11406b5f355f54b756f6da6096 (diff) | |
Revert "qcacld-3.0: Refactor WMA data commands to fix WIN compilation"
This change reverts Change-Id:I48978e51ca6bd4416420ee66746d5bfe7adae3c9
Change-Id: I97bd7e1c9977c061f138d3415d2d7d756b401582
CRs-Fixed: 1008872
| -rw-r--r-- | core/wma/src/wma_data.c | 25 | ||||
| -rw-r--r-- | core/wma/src/wma_mgmt.c | 6 |
2 files changed, 10 insertions, 21 deletions
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c index 7ffe857a8f11..85b836bc5579 100644 --- a/core/wma/src/wma_data.c +++ b/core/wma/src/wma_data.c @@ -2382,7 +2382,6 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, tpAniSirGlobal pMac; tpSirMacMgmtHdr mHdr; struct wmi_mgmt_params mgmt_param = {0}; - struct wmi_desc_t *wmi_desc = NULL; ol_pdev_handle ctrl_pdev; if (NULL == wma_handle) { @@ -2699,25 +2698,21 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen, mgmt_param.tx_frame = tx_frame; mgmt_param.frm_len = frmLen; mgmt_param.vdev_id = vdev_id; - mgmt_param.pdata = pData; + mgmt_param.tx_complete_cb = tx_frm_download_comp_cb; + mgmt_param.tx_ota_post_proc_cb = tx_frm_ota_comp_cb; mgmt_param.chanfreq = chanfreq; + mgmt_param.pdata = pData; mgmt_param.qdf_ctx = cds_get_context(QDF_MODULE_ID_QDF_DEVICE); - wmi_desc = wmi_desc_get(wma_handle); - if (!wmi_desc) { - WMA_LOGE("%s: Failed to get wmi_desc", __func__); + mgmt_param.wmi_desc = wmi_desc_get(wma_handle); + if (NULL == mgmt_param.wmi_desc) { + WMA_LOGE(FL("Failed to get wmi descriptor")); status = QDF_STATUS_E_FAILURE; } else { - mgmt_param.desc_id = wmi_desc->desc_id; status = wmi_mgmt_unified_cmd_send( - wma_handle->wmi_handle, - &mgmt_param); - if (status) { - wmi_desc_put(wma_handle, wmi_desc); - } else { - wmi_desc->nbuf = tx_frame; - wmi_desc->tx_cmpl_cb = tx_frm_download_comp_cb; - wmi_desc->ota_post_proc_cb = tx_frm_ota_comp_cb; - } + wma_handle->wmi_handle, + &mgmt_param); + if (status) + wmi_desc_put(wma_handle, mgmt_param.wmi_desc); } } else { /* Hand over the Tx Mgmt frame to TxRx */ diff --git a/core/wma/src/wma_mgmt.c b/core/wma/src/wma_mgmt.c index f416f707a9dd..48ae5e971169 100644 --- a/core/wma/src/wma_mgmt.c +++ b/core/wma/src/wma_mgmt.c @@ -663,12 +663,6 @@ void wma_set_sta_keep_alive(tp_wma_handle wma, uint8_t vdev_id, return; } - if (timeperiod > WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX) { - WMI_LOGE("Invalid period %d Max limit %d", timeperiod, - WNI_CFG_INFRA_STA_KEEP_ALIVE_PERIOD_STAMAX); - return; - } - params.vdev_id = vdev_id; params.method = method; params.timeperiod = timeperiod; |