瀏覽代碼

iwlwifi: rename iwl_add_local_station

This function is now only used for the special
IBSS BSSID station, so rename it to indicate
this. The new name is iwl_add_bssid_station.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Johannes Berg 15 年之前
父節點
當前提交
57f8db8934

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-3945.c

@@ -2465,7 +2465,7 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv,
 	int ret;
 	int ret;
 
 
 	if (add) {
 	if (add) {
-		ret = iwl_add_local_station(priv, vif->bss_conf.bssid, false,
+		ret = iwl_add_bssid_station(priv, vif->bss_conf.bssid, false,
 					    &vif_priv->ibss_bssid_sta_id);
 					    &vif_priv->ibss_bssid_sta_id);
 		if (ret)
 		if (ret)
 			return ret;
 			return ret;

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-agn-lib.c

@@ -1523,7 +1523,7 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv,
 	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
 	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;
 
 
 	if (add)
 	if (add)
-		return iwl_add_local_station(priv, vif->bss_conf.bssid, true,
+		return iwl_add_bssid_station(priv, vif->bss_conf.bssid, true,
 					     &vif_priv->ibss_bssid_sta_id);
 					     &vif_priv->ibss_bssid_sta_id);
 	return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,
 	return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,
 				  vif->bss_conf.bssid);
 				  vif->bss_conf.bssid);

+ 3 - 6
drivers/net/wireless/iwlwifi/iwl-sta.c

@@ -417,14 +417,11 @@ static struct iwl_link_quality_cmd *iwl_sta_alloc_lq(struct iwl_priv *priv,
 }
 }
 
 
 /*
 /*
- * iwl_add_local_station - Add stations not requested by mac80211
- *
- * This will be either the broadcast station or the bssid station needed by
- * ad-hoc.
+ * iwl_add_bssid_station - Add the special IBSS BSSID station
  *
  *
  * Function sleeps.
  * Function sleeps.
  */
  */
-int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
+int iwl_add_bssid_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
 			  u8 *sta_id_r)
 			  u8 *sta_id_r)
 {
 {
 	int ret;
 	int ret;
@@ -468,7 +465,7 @@ int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
 
 
 	return 0;
 	return 0;
 }
 }
-EXPORT_SYMBOL(iwl_add_local_station);
+EXPORT_SYMBOL(iwl_add_bssid_station);
 
 
 /**
 /**
  * iwl_sta_ucode_deactivate - deactivate ucode status for a station
  * iwl_sta_ucode_deactivate - deactivate ucode status for a station

+ 1 - 1
drivers/net/wireless/iwlwifi/iwl-sta.h

@@ -63,7 +63,7 @@ void iwl_dealloc_bcast_station(struct iwl_priv *priv);
 int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
 int iwl_get_free_ucode_key_index(struct iwl_priv *priv);
 int iwl_send_add_sta(struct iwl_priv *priv,
 int iwl_send_add_sta(struct iwl_priv *priv,
 		     struct iwl_addsta_cmd *sta, u8 flags);
 		     struct iwl_addsta_cmd *sta, u8 flags);
-int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
+int iwl_add_bssid_station(struct iwl_priv *priv, const u8 *addr, bool init_rs,
 			  u8 *sta_id_r);
 			  u8 *sta_id_r);
 int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,
 int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,
 				  bool is_ap,
 				  bool is_ap,