From 179762a2aec370614add45e4b9bc51f52cf7464e Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Sat, 24 Mar 2018 11:06:35 -0700 Subject: [PATCH] qcacld-3.0: Remove obsolete "change country code" callbacks In HDD there are currenty two different callback functions which were formerly used to synchronize country code changes with SME: - wlan_hdd_change_country_code_callback() - wlan_hdd_change_country_code_cb() With the "converged regulatory" implementation these are no longer used, so remove them. Change-Id: I65da8160c9057383ad3ccf3b2094b4c52fcf5a47 CRs-Fixed: 2212959 --- core/hdd/inc/wlan_hdd_main.h | 3 --- core/hdd/inc/wlan_hdd_wext.h | 2 -- core/hdd/src/wlan_hdd_cfg80211.c | 11 ----------- core/hdd/src/wlan_hdd_cfg80211.h | 1 - core/hdd/src/wlan_hdd_main.c | 1 - core/hdd/src/wlan_hdd_wext.c | 24 ------------------------ 6 files changed, 42 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_main.h b/core/hdd/inc/wlan_hdd_main.h index 188ad8597685..1a31ad0d24c8 100644 --- a/core/hdd/inc/wlan_hdd_main.h +++ b/core/hdd/inc/wlan_hdd_main.h @@ -1150,9 +1150,6 @@ struct hdd_adapter { struct completion roaming_comp_var; - /** Completion of change country code */ - struct completion change_country_code; - /* completion variable for Linkup Event */ struct completion linkup_event_var; diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index 04020382c18c..8c902c06ff24 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -321,8 +321,6 @@ int hdd_set_11ax_rate(struct hdd_adapter *adapter, int value, */ int hdd_set_peer_rate(struct hdd_adapter *adapter, int value); -void wlan_hdd_change_country_code_callback(void *adapter); - int wlan_hdd_update_phymode(struct net_device *net, tHalHandle hal, int new_phymode, struct hdd_context *phddctx); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 513b98a9bd06..6140ebf4e961 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -16018,17 +16018,6 @@ static int wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy, return ret; } -/* FUNCTION: wlan_hdd_change_country_code_cd - * to wait for contry code completion - */ -void *wlan_hdd_change_country_code_cb(void *adapter) -{ - struct hdd_adapter *call_back_adapter = adapter; - - complete(&call_back_adapter->change_country_code); - return NULL; -} - /** * __wlan_hdd_cfg80211_change_iface() - change interface cfg80211 op * @wiphy: Pointer to the wiphy structure diff --git a/core/hdd/src/wlan_hdd_cfg80211.h b/core/hdd/src/wlan_hdd_cfg80211.h index 094868b706c6..42363cb1e8c5 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.h +++ b/core/hdd/src/wlan_hdd_cfg80211.h @@ -317,7 +317,6 @@ int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy, struct net_device *dev, u8 *peer); #endif -void *wlan_hdd_change_country_code_cb(void *adapter); void hdd_select_cbmode(struct hdd_adapter *adapter, uint8_t operationChannel, struct ch_params *ch_params); diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c index b526542b103a..3c515635ad74 100644 --- a/core/hdd/src/wlan_hdd_main.c +++ b/core/hdd/src/wlan_hdd_main.c @@ -3668,7 +3668,6 @@ static struct hdd_adapter *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx init_completion(&adapter->offchannel_tx_event); init_completion(&adapter->tx_action_cnf_event); init_completion(&adapter->ibss_peer_info_comp); - init_completion(&adapter->change_country_code); init_completion(&adapter->lfr_fw_status.disable_lfr_event); adapter->offloads_configured = false; diff --git a/core/hdd/src/wlan_hdd_wext.c b/core/hdd/src/wlan_hdd_wext.c index 95fd410fc63c..94266bec3d06 100644 --- a/core/hdd/src/wlan_hdd_wext.c +++ b/core/hdd/src/wlan_hdd_wext.c @@ -3860,30 +3860,6 @@ static int iw_get_linkspeed(struct net_device *dev, return ret; } -/** - * wlan_hdd_change_country_code_callback() - Change country code callback - * @context: opaque context originally passed to SME. All functions - * which use this callback pass the adapter upon which the country - * code change is active - * - * This function is registered as the callback function when - * sme_change_country_code() is invoked. Callers of - * sme_change_country_code() subsequently wait for the adapter's - * @change_country_code completion variable, so all this function - * needs to do is set that completion variable so that execution can - * continue. - * - * Return: none - */ -void wlan_hdd_change_country_code_callback(void *context) -{ - - struct hdd_adapter *adapter = context; - - if (adapter && (WLAN_HDD_ADAPTER_MAGIC == adapter->magic)) - complete(&adapter->change_country_code); -} - /** * wlan_hdd_update_phymode() - handle change in PHY mode * @net: device upon which PHY mode change was received