diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 58b4ad69214c..6fefaaf4928f 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -623,12 +623,6 @@ typedef struct hdd_cfg80211_state_s { eP2PActionFrameState actionFrmState; } hdd_cfg80211_state_t; -typedef enum { - HDD_SSR_NOT_REQUIRED, - HDD_SSR_REQUIRED, - HDD_SSR_DISABLED, -} e_hdd_ssr_required; - struct hdd_station_ctx { /** Handle to the Wireless Extension State */ hdd_wext_state_t WextState; @@ -1397,8 +1391,6 @@ void wlan_hdd_reset_prob_rspies(hdd_adapter_t *pHostapdAdapter); void hdd_prevent_suspend(uint32_t reason); void hdd_allow_suspend(uint32_t reason); void hdd_prevent_suspend_timeout(uint32_t timeout, uint32_t reason); -bool hdd_is_ssr_required(void); -void hdd_set_ssr_required(e_hdd_ssr_required value); void wlan_hdd_cfg80211_update_wiphy_caps(struct wiphy *wiphy); CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *pAdapter); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index 64f6a934669f..eab8bdb240ba 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -146,8 +146,6 @@ static int wlan_hdd_inited; DEFINE_SPINLOCK(hdd_context_lock); static cdf_wake_lock_t wlan_wake_lock; -/* set when SSR is needed after unload */ -static e_hdd_ssr_required is_ssr_required = HDD_SSR_NOT_REQUIRED; #define WOW_MAX_FILTER_LISTS 1 #define WOW_MAX_FILTERS_PER_LIST 4 @@ -3051,20 +3049,6 @@ CDF_STATUS hdd_start_all_adapters(hdd_context_t *hdd_ctx) return CDF_STATUS_SUCCESS; } -bool hdd_is_ssr_required(void) -{ - return is_ssr_required == HDD_SSR_REQUIRED; -} - -/* Once SSR is disabled then it cannot be set. */ -void hdd_set_ssr_required(e_hdd_ssr_required value) -{ - if (HDD_SSR_DISABLED == is_ssr_required) - return; - - is_ssr_required = value; -} - CDF_STATUS hdd_get_front_adapter(hdd_context_t *hdd_ctx, hdd_adapter_list_node_t **padapterNode) { @@ -3569,19 +3553,6 @@ free_hdd_ctx: wiphy_unregister(wiphy); wiphy_free(wiphy); - if (hdd_is_ssr_required()) { -#ifdef MSM_PLATFORM -#ifdef CONFIG_CNSS - /* - * WDI timeout had happened during unload, so SSR is needed - * here - */ - subsystem_restart("wcnss"); -#endif -#endif - msleep(5000); - } - hdd_set_ssr_required(false); } void __hdd_wlan_exit(void) @@ -5534,20 +5505,6 @@ err_free_hdd_context: /* kfree(wdev) ; */ CDF_BUG(1); - if (hdd_is_ssr_required()) { -#ifdef MSM_PLATFORM -#ifdef CONFIG_CNSS - /* - * WDI timeout had happened during load, so SSR is needed - * here - */ - subsystem_restart("wcnss"); -#endif -#endif - msleep(5000); - } - hdd_set_ssr_required(false); - return -EIO; success: