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

Commit 93286db5 authored by Johannes Berg's avatar Johannes Berg Committed by Reinette Chatre
Browse files

iwlagn: move iwl_get_ra_sta_id to 4965 



This function is only needed by 4965, so
it need not be in core code and can be
made static.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent 159605dd

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

+10 −0
Original line number Diff line number Diff line
@@ -1953,6 +1953,16 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, 
	return 0;

}



static int iwl_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)

{

	if (priv->iw_mode == NL80211_IFTYPE_STATION) {

		return IWL_AP_ID;

	} else {

		u8 *da = ieee80211_get_DA(hdr);

		return iwl_find_station(priv, da);

	}

}



/**

 * iwl4965_rx_reply_tx - Handle standard (non-aggregation) Tx response

 */

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

+0 −11
Original line number Diff line number Diff line
@@ -80,17 +80,6 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr) 
}

EXPORT_SYMBOL(iwl_find_station);



int iwl_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)

{

	if (priv->iw_mode == NL80211_IFTYPE_STATION) {

		return IWL_AP_ID;

	} else {

		u8 *da = ieee80211_get_DA(hdr);

		return iwl_find_station(priv, da);

	}

}

EXPORT_SYMBOL(iwl_get_ra_sta_id);



/* priv->sta_lock must be held */

static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ void iwl_restore_stations(struct iwl_priv *priv); 
void iwl_clear_ucode_stations(struct iwl_priv *priv, bool force);

int iwl_get_free_ucode_key_index(struct iwl_priv *priv);

int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr);

int iwl_get_ra_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr);

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