diff options
| author | Yun Park <yunp@qca.qualcomm.com> | 2015-01-21 18:44:28 -0800 |
|---|---|---|
| committer | AnjaneeDevi Kapparapu <c_akappa@qti.qualcomm.com> | 2015-01-22 14:38:45 +0530 |
| commit | d40ef7a4f49a2974ba1c76b98cfe2a6b3973129d (patch) | |
| tree | 71e004816c34c66ad0c53cfa9b4cd5eeeaf77ea7 | |
| parent | 4f924d04fc5a49247ba29630c0bf99cca15b1723 (diff) | |
Revert "qcacld: Check vdev_up before sending PROTECTION_MOD WMI parameter"
This reverts commit 9a5f47a532b32b12bec0d07a6e8767877199024a.
Change-Id: I70704b74500bc50042107de3eb5aa8e39c3dfd03
CRs-Fixed: 773726
| -rw-r--r-- | CORE/SERVICES/WMA/wma.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c index ba6a24d19faa..dfbf102c5c0c 100644 --- a/CORE/SERVICES/WMA/wma.c +++ b/CORE/SERVICES/WMA/wma.c @@ -1152,6 +1152,7 @@ wmi_unified_vdev_set_param_send(wmi_unified_t wmi_handle, u_int32_t if_id, wmi_vdev_set_param_cmd_fixed_param *cmd; wmi_buf_t buf; u_int16_t len = sizeof(*cmd); + tp_wma_handle wma; buf = wmi_buf_alloc(wmi_handle, len); if (!buf) { @@ -1169,6 +1170,16 @@ wmi_unified_vdev_set_param_send(wmi_unified_t wmi_handle, u_int32_t if_id, WMA_LOGD("Setting vdev %d param = %x, value = %u", if_id, param_id, param_value); + wma = vos_get_context(VOS_MODULE_ID_WDA, + vos_get_global_context(VOS_MODULE_ID_WDA, NULL)); + + if (!wma->interfaces[if_id].vdev_up) { + WMA_LOGE("%s:vdev %d is not up. Skipping to send set param cmd" + , __func__, if_id); + wmi_buf_free(buf); + return -EINVAL; + } + ret = wmi_unified_cmd_send(wmi_handle, buf, len, WMI_VDEV_SET_PARAM_CMDID); if (ret < 0) { @@ -12134,12 +12145,6 @@ wma_update_protection_mode(tp_wma_handle wma, u_int8_t vdev_id, prot_mode = llbcoexist ? IEEE80211_PROT_CTSONLY : IEEE80211_PROT_NONE; - if (!wma->interfaces[vdev_id].vdev_up) { - WMA_LOGE("%s:vdev %d is not up. Skipping to send PROTECTION_MODE" - , __func__, vdev_id); - return; - } - ret = wmi_unified_vdev_set_param_send(wma->wmi_handle, vdev_id, WMI_VDEV_PARAM_PROTECTION_MODE, prot_mode); |