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

qcacld-3.0: Remove obsolete sap_start_work

Browse Source 
Previously Policy Manager refactoring moved the logic for handling
different concurrency scenarios to the qca-wifi-host-cmn project.
Subsequently change I6cb9fe12bee3702556c9b52e7ccb7c69c762d8de
("qcacld-3.0: Remove legacy code for policy manager restructuring")
attempted to remove all of the legacy support. However a few remnants
remain, so remove the remaining support for the following items:
- sap_start_work
- is_sap_restart_required
- is_sta_connection_pending
- sap_update_info_lock
- sta_update_info_lock

Change-Id: I261e69938efddb4389982c77102ec07ed7591d9e
CRs-Fixed: 2363233
This commit is contained in:
Jeff Johnson
2018-12-07 13:02:34 -08:00
committed by nshrivas
parent 58894a1df3
commit 84b81380a1
3 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/hdd/inc/wlan_hdd_main.h
View File

@@ -1823,12 +1823,6 @@ struct hdd_context {
qdf_work_t sta_ap_intf_check_work; qdf_work_t sta_ap_intf_check_work;
#endif #endif
struct work_struct sap_start_work;
bool is_sap_restart_required;
bool is_sta_connection_pending;
qdf_spinlock_t sap_update_info_lock;
qdf_spinlock_t sta_update_info_lock;
uint8_t dev_dfs_cac_status; uint8_t dev_dfs_cac_status;
bool bt_coex_mode_set; bool bt_coex_mode_set;

18
core/hdd/src/wlan_hdd_hostapd.c
View File

@@ -191,7 +191,6 @@ int hdd_sap_context_init(struct hdd_context *hdd_ctx)
mutex_init(&hdd_ctx->sap_lock); mutex_init(&hdd_ctx->sap_lock);
qdf_wake_lock_create(&hdd_ctx->sap_wake_lock, "qcom_sap_wakelock"); qdf_wake_lock_create(&hdd_ctx->sap_wake_lock, "qcom_sap_wakelock");
qdf_spinlock_create(&hdd_ctx->sap_update_info_lock);
return 0; return 0;
} }
@@ -386,9 +385,6 @@ void hdd_sap_context_destroy(struct hdd_context *hdd_ctx)
mutex_destroy(&hdd_ctx->sap_lock); mutex_destroy(&hdd_ctx->sap_lock);
qdf_wake_lock_destroy(&hdd_ctx->sap_wake_lock); qdf_wake_lock_destroy(&hdd_ctx->sap_wake_lock);
qdf_spinlock_destroy(&hdd_ctx->sap_update_info_lock);
} }
/** /**
@@ -5465,7 +5461,6 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
struct hdd_beacon_data *old; struct hdd_beacon_data *old;
int ret; int ret;
mac_handle_t mac_handle; mac_handle_t mac_handle;
uint8_t conc_rule1 = 0;
hdd_enter(); hdd_enter();
@@ -5520,19 +5515,6 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
wlan_hdd_del_station(adapter); wlan_hdd_del_station(adapter);
cds_flush_work(&adapter->sap_stop_bss_work); cds_flush_work(&adapter->sap_stop_bss_work);
ucfg_policy_mgr_get_conc_rule1(hdd_ctx->psoc, &conc_rule1);
/*
* When ever stop ap adapter gets called, we need to check
* whether any restart AP work is pending. If any restart is pending
* then lets finish it and go ahead from there.
*/
if (conc_rule1 && (QDF_SAP_MODE == adapter->device_mode)) {
cds_flush_work(&hdd_ctx->sap_start_work);
hdd_debug("Canceled the pending restart work");
qdf_spin_lock(&hdd_ctx->sap_update_info_lock);
hdd_ctx->is_sap_restart_required = false;
qdf_spin_unlock(&hdd_ctx->sap_update_info_lock);
}
adapter->session.ap.sap_config.acs_cfg.acs_mode = false; adapter->session.ap.sap_config.acs_cfg.acs_mode = false;
qdf_atomic_set(&adapter->session.ap.acs_in_progress, 0); qdf_atomic_set(&adapter->session.ap.acs_in_progress, 0);
wlan_hdd_undo_acs(adapter); wlan_hdd_undo_acs(adapter);

2
core/hdd/src/wlan_hdd_main.c
View File

@@ -7330,7 +7330,6 @@ void hdd_wlan_exit(struct hdd_context *hdd_ctx)
} }
qdf_spinlock_destroy(&hdd_ctx->hdd_adapter_lock); qdf_spinlock_destroy(&hdd_ctx->hdd_adapter_lock);
qdf_spinlock_destroy(&hdd_ctx->sta_update_info_lock);
qdf_spinlock_destroy(&hdd_ctx->connection_status_lock); qdf_spinlock_destroy(&hdd_ctx->connection_status_lock);
wlan_hdd_cache_chann_mutex_destroy(hdd_ctx); wlan_hdd_cache_chann_mutex_destroy(hdd_ctx);
@@ -9120,7 +9119,6 @@ static int hdd_context_init(struct hdd_context *hdd_ctx)
init_completion(&hdd_ctx->ready_to_suspend); init_completion(&hdd_ctx->ready_to_suspend);
qdf_spinlock_create(&hdd_ctx->connection_status_lock); qdf_spinlock_create(&hdd_ctx->connection_status_lock);
qdf_spinlock_create(&hdd_ctx->sta_update_info_lock);
qdf_spinlock_create(&hdd_ctx->hdd_adapter_lock); qdf_spinlock_create(&hdd_ctx->hdd_adapter_lock);
qdf_list_create(&hdd_ctx->hdd_adapters, 0); qdf_list_create(&hdd_ctx->hdd_adapters, 0);