From d66b4d56a43d8dc44cf152eabb81fbd5f21f74d8 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Mon, 26 Mar 2018 09:33:08 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete support for nAPAutoShutOff The AP auto shutoff feature controlled by INI item nAPAutoShutOff is obsolete, so remove it. Change-Id: I9e96bee36acc1ea1ac6f775ae04b31929bcb8406 CRs-Fixed: 2215925 --- core/hdd/inc/wlan_hdd_cfg.h | 23 ----- core/hdd/inc/wlan_hdd_main.h | 3 - core/hdd/src/wlan_hdd_cfg.c | 9 -- core/hdd/src/wlan_hdd_hostapd.c | 148 -------------------------------- 4 files changed, 183 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index 982f7915f923..c818e0fc2012 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -2934,28 +2934,6 @@ enum hdd_dot11_mode { #define CFG_AP_STA_SECURITY_SEPERATION_MAX (1) #define CFG_AP_STA_SECURITY_SEPERATION_DEFAULT (0) -/* - * - * gAPAutoShutOff - Auto shutdown when timer expires - * @Min: 0 - * @Max: 4294967295UL - * @Default: 0 - * - * This ini is used to configure timer value to shutdown AP once timer expired - * - * Related: None. - * - * Supported Feature: SAP - * - * Usage: Internal/External - * - * - */ -#define CFG_AP_AUTO_SHUT_OFF "gAPAutoShutOff" -#define CFG_AP_AUTO_SHUT_OFF_MIN (0) -#define CFG_AP_AUTO_SHUT_OFF_MAX (4294967295UL) -#define CFG_AP_AUTO_SHUT_OFF_DEFAULT (0) - /* * * gApKeepAlivePeriod - AP keep alive period @@ -14441,7 +14419,6 @@ struct hdd_config { uint16_t apProtection; bool apOBSSProtEnabled; bool apDisableIntraBssFwd; - uint32_t nAPAutoShutOff; uint8_t enableLTECoex; uint32_t apKeepAlivePeriod; uint32_t goKeepAlivePeriod; diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 107230a21432..284bcb312c1a 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -970,8 +970,6 @@ struct hdd_station_info { * @hostapd_state: state control information * @dfs_cac_block_tx: Is data tramsmission blocked due to DFS CAC? * @ap_active: Are any stations active? - * @hdd_ap_inactivity_timer: Timer used to shutdown the AP if it is - * inactive for an extended amount of time. * @disable_intrabss_fwd: Prevent forwarding between stations * @broadcast_sta_id: Station ID assigned after BSS starts * @privacy: The privacy bits of configuration @@ -992,7 +990,6 @@ struct hdd_ap_ctx { struct hdd_hostapd_state hostapd_state; bool dfs_cac_block_tx; bool ap_active; - qdf_mc_timer_t hdd_ap_inactivity_timer; bool disable_intrabss_fwd; uint8_t broadcast_sta_id; uint8_t privacy; diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index cad8e15af074..89ec7918eec8 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -1321,13 +1321,6 @@ struct reg_table_entry g_registry_table[] = { CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN, CFG_QOS_IMPLICIT_SETUP_ENABLED_MAX), - REG_VARIABLE(CFG_AP_AUTO_SHUT_OFF, WLAN_PARAM_Integer, - struct hdd_config, nAPAutoShutOff, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_AP_AUTO_SHUT_OFF_DEFAULT, - CFG_AP_AUTO_SHUT_OFF_MIN, - CFG_AP_AUTO_SHUT_OFF_MAX), - #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH REG_VARIABLE(CFG_WLAN_MCC_TO_SCC_SWITCH_MODE, WLAN_PARAM_Integer, struct hdd_config, WlanMccToSccSwitchMode, @@ -6535,8 +6528,6 @@ void hdd_cfg_print(struct hdd_context *hdd_ctx) hdd_debug("Name = [gEnableApProt] value = [%u]", hdd_ctx->config->apProtEnabled); - hdd_debug("Name = [gAPAutoShutOff] Value = [%u]", - hdd_ctx->config->nAPAutoShutOff); #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH hdd_debug("Name = [gWlanMccToSccSwitchMode] Value = [%u]", hdd_ctx->config->WlanMccToSccSwitchMode); diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index c4a7ef5612e8..f880deca377a 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -729,79 +729,6 @@ static int hdd_hostapd_set_mac_address(struct net_device *dev, void *addr) return ret; } -/** - * hdd_hostapd_inactivity_timer_cb() - Inactivity timeout handler - * @context: Context registered with qdf_mc_timer_init() - * - * This is the callback function registered with qdf_mc_timer_init() - * to handle the AP inactivity timer. The @context registered is the - * struct net_device associated with the interface. When this - * function is called it means the AP inactivity timer has fired, and - * this function in turn indicates the timeout to userspace. - */ - -static void hdd_hostapd_inactivity_timer_cb(void *context) -{ - struct net_device *dev = (struct net_device *)context; - uint8_t we_custom_event[64]; - union iwreq_data wrqu; -#ifdef DISABLE_CONCURRENCY_AUTOSAVE - QDF_STATUS qdf_status; - struct hdd_adapter *adapter; - struct hdd_ap_ctx *ap_ctx; - struct hdd_context *hdd_ctx; -#endif /* DISABLE_CONCURRENCY_AUTOSAVE */ - - /* event_name space-delimiter driver_module_name - * Format of the event is "AUTO-SHUT.indication" " " "module_name" - */ - char *autoShutEvent = "AUTO-SHUT.indication" " " KBUILD_MODNAME; - - /* For the NULL at the end */ - int event_len = strlen(autoShutEvent) + 1; - - hdd_enter_dev(dev); - -#ifdef DISABLE_CONCURRENCY_AUTOSAVE - hdd_ctx = WLAN_HDD_GET_CTX(adapter); - if (policy_mgr_concurrent_open_sessions_running(hdd_ctx->hdd_psoc)) { - /* - * This timer routine is going to be called only when AP - * persona is up. - * If there are concurrent sessions running we do not want - * to shut down the Bss.Instead we run the timer again so - * that if Autosave is enabled next time and other session - was down only then we bring down AP - */ - adapter = netdev_priv(dev); - if (WLAN_HDD_ADAPTER_MAGIC != adapter->magic) { - hdd_err("invalid adapter: %pK", adapter); - return; - } - ap_ctx = WLAN_HDD_GET_AP_CTX_PTR(adapter); - qdf_status = - qdf_mc_timer_start(&ap_ctx->hdd_ap_inactivity_timer, - (WLAN_HDD_GET_CTX(adapter))-> - config->nAPAutoShutOff * 1000); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to init AP inactivity timer"); - - hdd_exit(); - return; - } -#endif /* DISABLE_CONCURRENCY_AUTOSAVE */ - memset(&we_custom_event, '\0', sizeof(we_custom_event)); - memcpy(&we_custom_event, autoShutEvent, event_len); - - memset(&wrqu, 0, sizeof(wrqu)); - wrqu.data.length = event_len; - - hdd_debug("Shutting down AP interface due to inactivity"); - wireless_send_event(dev, IWEVCUSTOM, &wrqu, (char *)we_custom_event); - - hdd_exit(); -} - static void hdd_clear_sta(struct hdd_adapter *adapter, uint8_t sta_id) { struct hdd_ap_ctx *ap_ctx; @@ -1789,29 +1716,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } } - if (0 != - (WLAN_HDD_GET_CTX(adapter))->config-> - nAPAutoShutOff) { - /* AP Inactivity timer init and start */ - qdf_status = - qdf_mc_timer_init(&ap_ctx-> - hdd_ap_inactivity_timer, - QDF_TIMER_TYPE_SW, - hdd_hostapd_inactivity_timer_cb, - dev); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to init inactivity timer"); - - qdf_status = - qdf_mc_timer_start(&ap_ctx-> - hdd_ap_inactivity_timer, - (WLAN_HDD_GET_CTX - (adapter))->config-> - nAPAutoShutOff * 1000); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to init inactivity timer"); - - } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(hdd_ctx, true); #endif @@ -2212,15 +2116,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } #endif ap_ctx->ap_active = true; - /* Stop AP inactivity timer */ - if (ap_ctx->hdd_ap_inactivity_timer.state == - QDF_TIMER_STATE_RUNNING) { - qdf_status = - qdf_mc_timer_stop(&ap_ctx-> - hdd_ap_inactivity_timer); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to start inactivity timer"); - } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(hdd_ctx, false); #endif @@ -2354,31 +2249,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent, } spin_unlock_bh(&adapter->sta_info_lock); - /* Start AP inactivity timer if no stations associated */ - if ((0 != - (WLAN_HDD_GET_CTX(adapter))->config-> - nAPAutoShutOff)) { - if (ap_ctx->ap_active == false) { - if (ap_ctx->hdd_ap_inactivity_timer.state == - QDF_TIMER_STATE_STOPPED) { - qdf_status = - qdf_mc_timer_start(&ap_ctx-> - hdd_ap_inactivity_timer, - (WLAN_HDD_GET_CTX - (adapter))-> - config-> - nAPAutoShutOff * - 1000); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to init AP inactivity timer"); - } else - QDF_ASSERT - (qdf_mc_timer_get_current_state - (&ap_ctx-> - hdd_ap_inactivity_timer) == - QDF_TIMER_STATE_STOPPED); - } - } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(hdd_ctx, true); #endif @@ -2646,24 +2516,6 @@ stopbss: */ hostapd_state->bss_state = BSS_STOP; - if (0 != - (WLAN_HDD_GET_CTX(adapter))->config-> - nAPAutoShutOff) { - if (QDF_TIMER_STATE_RUNNING == - ap_ctx->hdd_ap_inactivity_timer.state) { - qdf_status = - qdf_mc_timer_stop(&ap_ctx-> - hdd_ap_inactivity_timer); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to stop AP inactivity timer"); - } - - qdf_status = - qdf_mc_timer_destroy(&ap_ctx-> - hdd_ap_inactivity_timer); - if (!QDF_IS_STATUS_SUCCESS(qdf_status)) - hdd_err("Failed to Destroy AP inactivity timer"); - } #ifdef FEATURE_WLAN_AUTO_SHUTDOWN wlan_hdd_auto_shutdown_enable(hdd_ctx, true); #endif