From 84b81380a1b8e12f4ba868e4f4a89c6a26dee35e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Fri, 7 Dec 2018 13:02:34 -0800 Subject: [PATCH] qcacld-3.0: Remove obsolete sap_start_work 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 --- core/hdd/inc/wlan_hdd_main.h | 6 ------ core/hdd/src/wlan_hdd_hostapd.c | 18 ------------------ core/hdd/src/wlan_hdd_main.c | 2 -- 3 files changed, 26 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index e3acf45a83..c3f366b34c 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1823,12 +1823,6 @@ struct hdd_context { qdf_work_t sta_ap_intf_check_work; #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; bool bt_coex_mode_set; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 0591ab642d..b8d22d1487 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -191,7 +191,6 @@ int hdd_sap_context_init(struct hdd_context *hdd_ctx) mutex_init(&hdd_ctx->sap_lock); qdf_wake_lock_create(&hdd_ctx->sap_wake_lock, "qcom_sap_wakelock"); - qdf_spinlock_create(&hdd_ctx->sap_update_info_lock); return 0; } @@ -386,9 +385,6 @@ void hdd_sap_context_destroy(struct hdd_context *hdd_ctx) mutex_destroy(&hdd_ctx->sap_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; int ret; mac_handle_t mac_handle; - uint8_t conc_rule1 = 0; hdd_enter(); @@ -5520,19 +5515,6 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, wlan_hdd_del_station(adapter); 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; qdf_atomic_set(&adapter->session.ap.acs_in_progress, 0); wlan_hdd_undo_acs(adapter); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 733d660050..75c74b5f37 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -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->sta_update_info_lock); qdf_spinlock_destroy(&hdd_ctx->connection_status_lock); 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); 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_list_create(&hdd_ctx->hdd_adapters, 0);