Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57f8db89 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

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: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent c1182743

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

+1 −1
Original line number Diff line number Diff line
@@ -2465,7 +2465,7 @@ static int iwl3945_manage_ibss_station(struct iwl_priv *priv, 
	int ret;



	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);

		if (ret)

			return ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -1523,7 +1523,7 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv, 
	struct iwl_vif_priv *vif_priv = (void *)vif->drv_priv;



	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);

	return iwl_remove_station(priv, vif_priv->ibss_bssid_sta_id,

				  vif->bss_conf.bssid);

drivers/net/wireless/iwlwifi/iwl-sta.c

+3 −6
Original line number Diff line number Diff line
@@ -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.

 */

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)

{

	int ret;
@@ -468,7 +465,7 @@ int iwl_add_local_station(struct iwl_priv *priv, const u8 *addr, bool init_rs, 


	return 0;

}

EXPORT_SYMBOL(iwl_add_local_station);

EXPORT_SYMBOL(iwl_add_bssid_station);



/**

 * iwl_sta_ucode_deactivate - deactivate ucode status for a station

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

+1 −1
Original line number Diff line number Diff line
@@ -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_send_add_sta(struct iwl_priv *priv,

		     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);

int iwl_add_station_common(struct iwl_priv *priv, const u8 *addr,

				  bool is_ap,