A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-12 15:49:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "qcacmn: Move deletion of datapath vdev to vdev destroy handler"

Browse source 
This revert commit Change-Id: I727d70e77f8e913ca732b6ae56c60049161547de.

Change-Id: I2481f74d417db257ac2ab448ab6a3d7b55d2f34e
CRs-Fixed: 2593434
This commit is contained in:
Naga 2020-01-10 15:56:59 +05:30 • committed by nshrivas
commit 29b109fa93
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
umac/mlme/mlme_objmgr/dispatcher/src/wlan_vdev_mlme_main.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2018-2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2018-2020 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@ -136,8 +136,6 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
void *arg)
{
struct vdev_mlme_obj *vdev_mlme;
struct wlan_objmgr_psoc *psoc;
struct cdp_soc_t *soc_txrx_handle;
if (!vdev) {
mlme_err(" VDEV is NULL");
@ -150,14 +148,6 @@ static QDF_STATUS mlme_vdev_obj_destroy_handler(struct wlan_objmgr_vdev *vdev,
return QDF_STATUS_SUCCESS;
}
psoc = wlan_vdev_get_psoc(vdev);
soc_txrx_handle = (struct cdp_soc_t *)wlan_psoc_get_dp_handle(psoc);
if (soc_txrx_handle) {
wlan_vdev_set_dp_handle(vdev, NULL);
cdp_vdev_detach(soc_txrx_handle, wlan_vdev_get_id(vdev),
NULL, NULL);
}
mlme_vdev_sm_destroy(vdev_mlme);
mlme_vdev_ops_ext_hdl_destroy(vdev_mlme);

12
umac/mlme/vdev_mgr/dispatcher/src/wlan_vdev_mgr_tgt_if_tx_api.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019 The Linux Foundation. All rights reserved.
* Copyright (c) 2019-2020 The Linux Foundation. All rights reserved.
*
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
@ -196,6 +196,8 @@ QDF_STATUS tgt_vdev_mgr_delete_send(
QDF_STATUS status;
struct wlan_lmac_if_mlme_tx_ops *txops;
struct wlan_objmgr_vdev *vdev;
struct wlan_objmgr_psoc *psoc;
ol_txrx_soc_handle soc_txrx_handle;
uint8_t vdev_id;
if (!param) {
@ -211,6 +213,14 @@ QDF_STATUS tgt_vdev_mgr_delete_send(
return QDF_STATUS_E_INVAL;
}
psoc = wlan_vdev_get_psoc(vdev);
soc_txrx_handle = wlan_psoc_get_dp_handle(psoc);
if (soc_txrx_handle) {
wlan_vdev_set_dp_handle(vdev, NULL);
cdp_vdev_detach(soc_txrx_handle, wlan_vdev_get_id(vdev),
NULL, NULL);
}
status = txops->vdev_delete_send(vdev, param);
if (QDF_IS_STATUS_ERROR(status))
mlme_err("VDEV_%d: Tx Ops Error : %d", vdev_id, status);