samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacmn: Revert target_if_vdev_mgr_rsp_timer_cb

Browse Source 
Revert the change for target_if_vdev_mgr_rsp_timer_cb
from change I760b41b81c006187efb162d410390e1c11878b82.
The change introduced a CFI error because timer
callbacks do not expect a return status.

Change-Id: I7502493b08d1a8bdb847e2c47165880143a6d708
CRs-fixed: 2685628
This commit is contained in:
Lincoln Tran
2020-06-08 14:14:33 -07:00
committed by nshrivas
parent 1aa085fcd2
commit 01b486c6a3
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
target_if/mlme/vdev_mgr/inc/target_if_vdev_mgr_rx_ops.h
View File

@@ -160,9 +160,8 @@ QDF_STATUS target_if_vdev_mgr_wmi_event_unregister(
* target_if_vdev_mgr_rsp_timer_cb() - function to handle vdev related timeouts * target_if_vdev_mgr_rsp_timer_cb() - function to handle vdev related timeouts
* @vdev_rsp: pointer to vdev response timer * @vdev_rsp: pointer to vdev response timer
* *
* Return: QDF_STATUS_SUCCESS on success, QDF_STATUS_E_FAILURE on error * Return: none
*/ */
QDF_STATUS void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp);
target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp);
#endif /* __TARGET_IF_VDEV_MGR_RX_OPS_H__ */ #endif /* __TARGET_IF_VDEV_MGR_RX_OPS_H__ */

16
target_if/mlme/vdev_mgr/src/target_if_vdev_mgr_rx_ops.c
View File

@@ -47,7 +47,7 @@ void target_if_vdev_mgr_handle_recovery(struct wlan_objmgr_psoc *psoc,
wlan_psoc_get_id(psoc), vdev_id); wlan_psoc_get_id(psoc), vdev_id);
} }
QDF_STATUS target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp) void target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
{ {
struct wlan_objmgr_psoc *psoc; struct wlan_objmgr_psoc *psoc;
struct wlan_lmac_if_mlme_rx_ops *rx_ops; struct wlan_lmac_if_mlme_rx_ops *rx_ops;
@@ -61,19 +61,19 @@ QDF_STATUS target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
if (!vdev_rsp) { if (!vdev_rsp) {
mlme_err("Vdev response timer is NULL"); mlme_err("Vdev response timer is NULL");
return QDF_STATUS_E_FAILURE; return;
} }
psoc = vdev_rsp->psoc; psoc = vdev_rsp->psoc;
if (!psoc) { if (!psoc) {
mlme_err("PSOC is NULL"); mlme_err("PSOC is NULL");
return QDF_STATUS_E_FAILURE; return;
} }
rx_ops = target_if_vdev_mgr_get_rx_ops(psoc); rx_ops = target_if_vdev_mgr_get_rx_ops(psoc);
if (!rx_ops || !rx_ops->psoc_get_vdev_response_timer_info) { if (!rx_ops || !rx_ops->psoc_get_vdev_response_timer_info) {
mlme_err("No Rx Ops"); mlme_err("No Rx Ops");
return QDF_STATUS_E_FAILURE; return;
} }
if (!qdf_atomic_test_bit(START_RESPONSE_BIT, &vdev_rsp->rsp_status) && if (!qdf_atomic_test_bit(START_RESPONSE_BIT, &vdev_rsp->rsp_status) &&
@@ -85,14 +85,14 @@ QDF_STATUS target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
&vdev_rsp->rsp_status)) { &vdev_rsp->rsp_status)) {
mlme_debug("No response bit is set, ignoring actions :%d", mlme_debug("No response bit is set, ignoring actions :%d",
vdev_rsp->vdev_id); vdev_rsp->vdev_id);
return QDF_STATUS_E_FAILURE; return;
} }
vdev_id = vdev_rsp->vdev_id; vdev_id = vdev_rsp->vdev_id;
if (vdev_id >= WLAN_UMAC_PSOC_MAX_VDEVS) { if (vdev_id >= WLAN_UMAC_PSOC_MAX_VDEVS) {
mlme_err("Invalid VDEV_%d PSOC_%d", vdev_id, mlme_err("Invalid VDEV_%d PSOC_%d", vdev_id,
wlan_psoc_get_id(psoc)); wlan_psoc_get_id(psoc));
return QDF_STATUS_E_FAILURE; return;
} }
vdev_rsp->timer_status = QDF_STATUS_E_TIMEOUT; vdev_rsp->timer_status = QDF_STATUS_E_TIMEOUT;
@@ -151,10 +151,8 @@ QDF_STATUS target_if_vdev_mgr_rsp_timer_cb(struct vdev_response_timer *vdev_rsp)
} else { } else {
mlme_err("PSOC_%d VDEV_%d: Unknown error", mlme_err("PSOC_%d VDEV_%d: Unknown error",
wlan_psoc_get_id(psoc), vdev_id); wlan_psoc_get_id(psoc), vdev_id);
return QDF_STATUS_E_FAILURE; return;
} }
return QDF_STATUS_SUCCESS;
} }
#ifdef SERIALIZE_VDEV_RESP #ifdef SERIALIZE_VDEV_RESP