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

Revert "qcacld-3.0: Block NDP_END_ALL req till last NDP_END is received"

Browse Source 
This reverts commit 54c2fe240a.

Change-Id: Ic0028674e4728b951215bf7b4d9a7535b8b49efe
CRs-Fixed: 3523826
This commit is contained in:
Rahul Gusain
2023-06-08 11:39:02 +05:30
committed by Rahul Choudhary
parent c1d792ec75
commit bb7e163983
6 changed files with 173 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/nan/dispatcher/src/nan_ucfg_api.c
View File

@@ -956,6 +956,7 @@ QDF_STATUS
ucfg_nan_disable_ndi(struct wlan_objmgr_psoc *psoc, uint32_t ndi_vdev_id)
{
enum nan_datapath_state curr_ndi_state;
struct nan_datapath_host_event *event;
struct nan_vdev_priv_obj *ndi_vdev_priv;
struct nan_datapath_end_all_ndps req = {0};
struct wlan_objmgr_vdev *ndi_vdev;
@@ -963,7 +964,7 @@ ucfg_nan_disable_ndi(struct wlan_objmgr_psoc *psoc, uint32_t ndi_vdev_id)
QDF_STATUS status;
int err;
static const struct osif_request_params params = {
.priv_size = 0,
.priv_size = sizeof(struct nan_datapath_host_event),
.timeout_ms = 1000,
};
@@ -1009,6 +1010,7 @@ ucfg_nan_disable_ndi(struct wlan_objmgr_psoc *psoc, uint32_t ndi_vdev_id)
if (QDF_IS_STATUS_ERROR(status)) {
nan_err("Unable to disable NDP's on NDI");
wlan_objmgr_vdev_release_ref(ndi_vdev, WLAN_NAN_ID);
goto cleanup;
}
@@ -1021,7 +1023,18 @@ ucfg_nan_disable_ndi(struct wlan_objmgr_psoc *psoc, uint32_t ndi_vdev_id)
goto cleanup;
}
policy_mgr_decr_session_set_pcl(psoc, QDF_NDI_MODE, ndi_vdev_id);
event = osif_request_priv(request);
if (!event->ndp_termination_in_progress) {
nan_err("Failed to terminate NDP's on NDI");
status = QDF_STATUS_E_FAILURE;
} else {
/*
* Host can assume NDP delete is successful and
* remove policy mgr entry
*/
policy_mgr_decr_session_set_pcl(psoc, QDF_NDI_MODE,
ndi_vdev_id);
}
cleanup:
/* Restore original NDI state in case of failure */
@@ -1030,8 +1043,6 @@ cleanup:
else
ucfg_nan_set_ndi_state(ndi_vdev, curr_ndi_state);
wlan_objmgr_vdev_release_ref(ndi_vdev, WLAN_NAN_ID);
if (request)
osif_request_put(request);