Kaynağa Gözat

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
Jeff Johnson 7 yıl önce
ebeveyn
işleme
179762a2ae

+ 0 - 3
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;
 

+ 0 - 2
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);
 

+ 0 - 11
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

+ 0 - 1
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);
 

+ 0 - 1
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;

+ 0 - 24
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