qcacmn: Move rsp timer stop logic from tgt to target if

Currently vdev response start timer logic is in
target_if layer and stop timer logic is in tgt
layer which is asymmetry.

So, move stop timer logic from tgt layer to
target_if layer for vdev start, stop and delete.

Change-Id: Ia06e2e6d90cf9c4366d654e016e2eeab8c2a0719
CRs-Fixed: 2442199
This commit is contained in:
Abhishek Ambure
2019-04-24 14:41:35 -07:00
committed by nshrivas
szülő 2a1312cd25
commit 6825cfe7fe
5 fájl változott, egészen pontosan 163 új sor hozzáadva és 63 régi sor törölve

Fájl megtekintése

@@ -50,8 +50,6 @@ static QDF_STATUS tgt_vdev_mgr_start_response_handler(
QDF_STATUS status = QDF_STATUS_E_FAILURE;
struct vdev_mlme_obj *vdev_mlme;
struct wlan_objmgr_vdev *vdev;
struct vdev_response_timer *vdev_rsp;
struct wlan_lmac_if_mlme_tx_ops *tx_ops;
if (!rsp || !psoc) {
mlme_err("Invalid input");
@@ -71,23 +69,11 @@ static QDF_STATUS tgt_vdev_mgr_start_response_handler(
goto tgt_vdev_mgr_start_response_handler_end;
}
vdev_rsp = &vdev_mlme->vdev_rt;
tx_ops = target_if_vdev_mgr_get_tx_ops(psoc);
if (rsp->resp_type == RESTART_RESPONSE)
status = tx_ops->vdev_mgr_rsp_timer_stop(vdev, vdev_rsp,
RESTART_RESPONSE_BIT);
else
status = tx_ops->vdev_mgr_rsp_timer_stop(vdev, vdev_rsp,
START_RESPONSE_BIT);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err("VDEV_%d: Unexpected response", rsp->vdev_id);
goto tgt_vdev_mgr_start_response_handler_end;
}
if ((vdev_mlme->ops) && vdev_mlme->ops->mlme_vdev_ext_start_rsp)
status = vdev_mlme->ops->mlme_vdev_ext_start_rsp(
vdev_mlme,
rsp);
tgt_vdev_mgr_start_response_handler_end:
wlan_objmgr_vdev_release_ref(vdev, WLAN_VDEV_TARGET_IF_ID);
return status;
@@ -100,8 +86,6 @@ static QDF_STATUS tgt_vdev_mgr_stop_response_handler(
QDF_STATUS status = QDF_STATUS_E_FAILURE;
struct vdev_mlme_obj *vdev_mlme;
struct wlan_objmgr_vdev *vdev;
struct vdev_response_timer *vdev_rsp;
struct wlan_lmac_if_mlme_tx_ops *tx_ops;
if (!rsp || !psoc) {
mlme_err("Invalid input");
@@ -121,19 +105,11 @@ static QDF_STATUS tgt_vdev_mgr_stop_response_handler(
goto tgt_vdev_mgr_stop_response_handler_end;
}
vdev_rsp = &vdev_mlme->vdev_rt;
tx_ops = target_if_vdev_mgr_get_tx_ops(psoc);
status = tx_ops->vdev_mgr_rsp_timer_stop(vdev, vdev_rsp,
STOP_RESPONSE_BIT);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err("VDEV_%d: Unexpected response", rsp->vdev_id);
goto tgt_vdev_mgr_stop_response_handler_end;
}
if ((vdev_mlme->ops) && vdev_mlme->ops->mlme_vdev_ext_stop_rsp)
status = vdev_mlme->ops->mlme_vdev_ext_stop_rsp(
vdev_mlme,
rsp);
tgt_vdev_mgr_stop_response_handler_end:
wlan_objmgr_vdev_release_ref(vdev, WLAN_VDEV_TARGET_IF_ID);
return status;
@@ -146,8 +122,6 @@ static QDF_STATUS tgt_vdev_mgr_delete_response_handler(
QDF_STATUS status = QDF_STATUS_E_FAILURE;
struct vdev_mlme_obj *vdev_mlme;
struct wlan_objmgr_vdev *vdev;
struct vdev_response_timer *vdev_rsp;
struct wlan_lmac_if_mlme_tx_ops *tx_ops;
if (!rsp || !psoc) {
mlme_err("Invalid input");
@@ -168,15 +142,6 @@ static QDF_STATUS tgt_vdev_mgr_delete_response_handler(
goto tgt_vdev_mgr_delete_response_handler_end;
}
vdev_rsp = &vdev_mlme->vdev_rt;
tx_ops = target_if_vdev_mgr_get_tx_ops(psoc);
status = tx_ops->vdev_mgr_rsp_timer_stop(vdev, vdev_rsp,
DELETE_RESPONSE_BIT);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err("VDEV_%d: Unexpected response", rsp->vdev_id);
goto tgt_vdev_mgr_delete_response_handler_end;
}
if ((vdev_mlme->ops) &&
vdev_mlme->ops->mlme_vdev_ext_delete_rsp)
status = vdev_mlme->ops->mlme_vdev_ext_delete_rsp(
@@ -195,8 +160,6 @@ static QDF_STATUS tgt_vdev_mgr_peer_delete_all_response_handler(
QDF_STATUS status = QDF_STATUS_E_FAILURE;
struct vdev_mlme_obj *vdev_mlme;
struct wlan_objmgr_vdev *vdev;
struct vdev_response_timer *vdev_rsp;
struct wlan_lmac_if_mlme_tx_ops *tx_ops;
if (!rsp || !psoc) {
mlme_err("Invalid input");
@@ -217,15 +180,6 @@ static QDF_STATUS tgt_vdev_mgr_peer_delete_all_response_handler(
goto tgt_vdev_mgr_peer_delete_all_response_handler_end;
}
vdev_rsp = &vdev_mlme->vdev_rt;
tx_ops = target_if_vdev_mgr_get_tx_ops(psoc);
status = tx_ops->vdev_mgr_rsp_timer_stop(vdev, vdev_rsp,
PEER_DELETE_ALL_RESPONSE_BIT);
if (QDF_IS_STATUS_ERROR(status)) {
mlme_err("VDEV_%d: Unexpected response", rsp->vdev_id);
goto tgt_vdev_mgr_peer_delete_all_response_handler_end;
}
if ((vdev_mlme->ops) &&
vdev_mlme->ops->mlme_vdev_ext_peer_delete_all_rsp)
status = vdev_mlme->ops->mlme_vdev_ext_peer_delete_all_rsp(