diff --git a/core/hdd/inc/wlan_hdd_cfg.h b/core/hdd/inc/wlan_hdd_cfg.h index bd166548ae93..d279c555370e 100644 --- a/core/hdd/inc/wlan_hdd_cfg.h +++ b/core/hdd/inc/wlan_hdd_cfg.h @@ -3286,31 +3286,6 @@ enum hdd_link_speed_rpt_type { #define CFG_LINK_SPEED_RSSI_LOW_MAX (0) #define CFG_LINK_SPEED_RSSI_LOW_DEFAULT (-80) -/* - * - * gEnableSSR - Enable/Disable SSR - * @Min: 0 - * @Max: 1 - * @Default: 1 - * - * This ini is used to enable/disable System Self Recovery at the times of - * System crash or fatal errors - * gEnableSSR = 0 Disabled - * gEnableSSR = 1 wlan shutdown and re-init happens - * - * Related: None - * - * Supported Feature: SSR - * - * Usage: External - * - * - */ -#define CFG_ENABLE_SSR "gEnableSSR" -#define CFG_ENABLE_SSR_MIN (0) -#define CFG_ENABLE_SSR_MAX (1) -#define CFG_ENABLE_SSR_DEFAULT (1) - /* * * gEnableOverLapCh - Enables Overlap Channel. If set, allow overlapping @@ -6552,7 +6527,6 @@ struct hdd_config { bool prevent_link_down; uint8_t scanAgingTimeout; uint8_t disableLDPCWithTxbfAP; - bool enableSSR; bool bFastRoamInConIniFeatureEnabled; bool fEnableSNRMonitoring; /*PNO related parameters */ diff --git a/core/hdd/src/wlan_hdd_cfg.c b/core/hdd/src/wlan_hdd_cfg.c index 3a5e4ea9cb1e..0acf039fe775 100644 --- a/core/hdd/src/wlan_hdd_cfg.c +++ b/core/hdd/src/wlan_hdd_cfg.c @@ -267,12 +267,6 @@ cb_notify_set_dfs_scan_mode(struct hdd_context *hdd_ctx, hdd_ctx->config->allowDFSChannelRoam); } -static void cb_notify_set_enable_ssr(struct hdd_context *hdd_ctx, - unsigned long notify_id) -{ - sme_update_enable_ssr(hdd_ctx->mac_handle, hdd_ctx->config->enableSSR); -} - static void ch_notify_set_g_disable_dfs_japan_w53(struct hdd_context *hdd_ctx, unsigned long notify_id) { @@ -1392,15 +1386,6 @@ struct reg_table_entry g_registry_table[] = { CFG_DISABLE_LDPC_WITH_TXBF_AP_MIN, CFG_DISABLE_LDPC_WITH_TXBF_AP_MAX), - REG_DYNAMIC_VARIABLE(CFG_ENABLE_SSR, WLAN_PARAM_Integer, - struct hdd_config, enableSSR, - VAR_FLAGS_OPTIONAL | - VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_ENABLE_SSR_DEFAULT, - CFG_ENABLE_SSR_MIN, - CFG_ENABLE_SSR_MAX, - cb_notify_set_enable_ssr, 0), - REG_DYNAMIC_VARIABLE(CFG_ENABLE_FAST_ROAM_IN_CONCURRENCY, WLAN_PARAM_Integer, struct hdd_config, bFastRoamInConIniFeatureEnabled, @@ -4006,8 +3991,6 @@ QDF_STATUS hdd_set_sme_config(struct hdd_context *hdd_ctx) smeConfig->csrConfig.isCoalesingInIBSSAllowed = hdd_ctx->config->isCoalesingInIBSSAllowed; - /* update SSR config */ - sme_update_enable_ssr(mac_handle, hdd_ctx->config->enableSSR); /* Update maximum interfaces information */ smeConfig->csrConfig.max_intf_count = hdd_ctx->max_intf_count; diff --git a/core/sme/inc/sme_api.h b/core/sme/inc/sme_api.h index f0abb0b65a8c..86b5fa35b1e6 100644 --- a/core/sme/inc/sme_api.h +++ b/core/sme/inc/sme_api.h @@ -890,10 +890,6 @@ QDF_STATUS sme_update_roam_scan_offload_enabled(mac_handle_t mac_handle, bool nRoamScanOffloadEnabled); bool sme_is_feature_supported_by_fw(enum cap_bitmap feature); -/* - * SME API to enable/disable WLAN driver initiated SSR - */ -void sme_update_enable_ssr(mac_handle_t mac_handle, bool enableSSR); QDF_STATUS sme_set_phy_mode(mac_handle_t mac_handle, eCsrPhyMode phyMode); eCsrPhyMode sme_get_phy_mode(mac_handle_t mac_handle); QDF_STATUS sme_handoff_request(mac_handle_t mac_handle, uint8_t sessionId, diff --git a/core/sme/src/common/sme_api.c b/core/sme/src/common/sme_api.c index 9e8dd35113c9..032e7c65e522 100644 --- a/core/sme/src/common/sme_api.c +++ b/core/sme/src/common/sme_api.c @@ -8627,25 +8627,6 @@ QDF_STATUS sme_get_peer_info_ext(mac_handle_t mac_handle, return status; } -/* - * SME API to enable/disable WLAN driver initiated SSR - */ -void sme_update_enable_ssr(mac_handle_t mac_handle, bool enableSSR) -{ - tpAniSirGlobal pMac = PMAC_STRUCT(mac_handle); - QDF_STATUS status = QDF_STATUS_SUCCESS; - - status = sme_acquire_global_lock(&pMac->sme); - if (QDF_IS_STATUS_SUCCESS(status)) { - sme_debug("SSR level is changed %d", enableSSR); - /* not serializing this message, as this is only going - * to set a variable in WMA/WDI - */ - WMA_SetEnableSSR(enableSSR); - sme_release_global_lock(&pMac->sme); - } -} - /*convert the ini value to the ENUM used in csr and MAC for CB state*/ ePhyChanBondState sme_get_cb_phy_state_from_cb_ini_value(uint32_t cb_ini_value) { diff --git a/core/wma/inc/wma_types.h b/core/wma/inc/wma_types.h index 150f1bc08067..5e3360fd92d3 100644 --- a/core/wma/inc/wma_types.h +++ b/core/wma/inc/wma_types.h @@ -497,9 +497,6 @@ (channel_freq), \ (rid))) - -#define WMA_SetEnableSSR(enable_ssr) ((void)enable_ssr) - /** * struct sUapsd_Params - Powersave Offload Changes * @bkDeliveryEnabled: BK delivery enabled flag