qcacld-3.0: Cleanup tdls_disable_in_progress condition checks
tdls_disable_in_progress checks are always false since the tdls_disable_in_progress is never set to true. So cleanup the condition checks that use the tdls_disable_in_progress variable. Change-Id: I8a5f868c09919fc5835b9f8f7f30a32d59dab74a CRs-Fixed: 3445123
This commit is contained in:

committed by
Madan Koyyalamudi

parent
439deefd2f
commit
b96ea38606
@@ -1547,9 +1547,6 @@ void tdls_process_enable_for_vdev(struct wlan_objmgr_vdev *vdev)
|
|||||||
if (QDF_IS_STATUS_ERROR(status))
|
if (QDF_IS_STATUS_ERROR(status))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (tdls_soc_obj->tdls_disable_in_progress)
|
|
||||||
return;
|
|
||||||
|
|
||||||
tdls_send_update_to_fw(tdls_vdev_obj, tdls_soc_obj,
|
tdls_send_update_to_fw(tdls_vdev_obj, tdls_soc_obj,
|
||||||
mlme_get_tdls_prohibited(vdev),
|
mlme_get_tdls_prohibited(vdev),
|
||||||
mlme_get_tdls_chan_switch_prohibited(vdev),
|
mlme_get_tdls_chan_switch_prohibited(vdev),
|
||||||
@@ -1617,15 +1614,14 @@ tdls_process_sta_disconnect(struct tdls_sta_notify_params *notify)
|
|||||||
notify->session_id);
|
notify->session_id);
|
||||||
|
|
||||||
/* Disassociation event */
|
/* Disassociation event */
|
||||||
if (!tdls_soc_obj->tdls_disable_in_progress)
|
tdls_send_update_to_fw(tdls_vdev_obj, tdls_soc_obj, false,
|
||||||
tdls_send_update_to_fw(tdls_vdev_obj, tdls_soc_obj, false,
|
false, false, notify->session_id);
|
||||||
false, false, notify->session_id);
|
|
||||||
|
|
||||||
/* If concurrency is not marked, then we have to
|
/* If concurrency is not marked, then we have to
|
||||||
* check, whether TDLS could be enabled in the
|
* check, whether TDLS could be enabled in the
|
||||||
* system after this disassoc event.
|
* system after this disassoc event.
|
||||||
*/
|
*/
|
||||||
if (notify->lfr_roam || tdls_soc_obj->tdls_disable_in_progress)
|
if (notify->lfr_roam)
|
||||||
return status;
|
return status;
|
||||||
|
|
||||||
temp_vdev = tdls_get_vdev(tdls_soc_obj->soc, WLAN_TDLS_NB_ID);
|
temp_vdev = tdls_get_vdev(tdls_soc_obj->soc, WLAN_TDLS_NB_ID);
|
||||||
|
@@ -167,7 +167,6 @@ struct tdls_set_state_info {
|
|||||||
* @tdls_external_peer_count: external tdls peer count
|
* @tdls_external_peer_count: external tdls peer count
|
||||||
* @tdls_nss_switch_in_progress: tdls antenna switch in progress
|
* @tdls_nss_switch_in_progress: tdls antenna switch in progress
|
||||||
* @tdls_nss_teardown_complete: tdls tear down complete
|
* @tdls_nss_teardown_complete: tdls tear down complete
|
||||||
* @tdls_disable_in_progress: tdls is disable in progress
|
|
||||||
* @tdls_nss_transition_mode: tdls nss transition mode
|
* @tdls_nss_transition_mode: tdls nss transition mode
|
||||||
* @tdls_teardown_peers_cnt: tdls tear down peer count
|
* @tdls_teardown_peers_cnt: tdls tear down peer count
|
||||||
* @set_state_info: set tdls state info
|
* @set_state_info: set tdls state info
|
||||||
@@ -223,7 +222,6 @@ struct tdls_soc_priv_obj {
|
|||||||
uint8_t tdls_external_peer_count;
|
uint8_t tdls_external_peer_count;
|
||||||
bool tdls_nss_switch_in_progress;
|
bool tdls_nss_switch_in_progress;
|
||||||
bool tdls_nss_teardown_complete;
|
bool tdls_nss_teardown_complete;
|
||||||
bool tdls_disable_in_progress;
|
|
||||||
enum tdls_nss_transition_state tdls_nss_transition_mode;
|
enum tdls_nss_transition_state tdls_nss_transition_mode;
|
||||||
int32_t tdls_teardown_peers_cnt;
|
int32_t tdls_teardown_peers_cnt;
|
||||||
struct tdls_set_state_info set_state_info;
|
struct tdls_set_state_info set_state_info;
|
||||||
|
@@ -289,7 +289,6 @@ static QDF_STATUS tdls_global_init(struct tdls_soc_priv_obj *soc_obj)
|
|||||||
soc_obj->tdls_nss_transition_mode = TDLS_NSS_TRANSITION_S_UNKNOWN;
|
soc_obj->tdls_nss_transition_mode = TDLS_NSS_TRANSITION_S_UNKNOWN;
|
||||||
soc_obj->enable_tdls_connection_tracker = false;
|
soc_obj->enable_tdls_connection_tracker = false;
|
||||||
soc_obj->tdls_external_peer_count = 0;
|
soc_obj->tdls_external_peer_count = 0;
|
||||||
soc_obj->tdls_disable_in_progress = false;
|
|
||||||
|
|
||||||
qdf_spinlock_create(&soc_obj->tdls_ct_spinlock);
|
qdf_spinlock_create(&soc_obj->tdls_ct_spinlock);
|
||||||
tdls_wow_init(soc_obj);
|
tdls_wow_init(soc_obj);
|
||||||
|
Reference in New Issue
Block a user