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

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

iwlwifi: move iwl_find_station() to 4965 



4965 code is the only thing that now still
needs iwl_find_station(), so move it there
and make it static. Everything else can
rely on the station data passed by mac80211.

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

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

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

}



static u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)

{

	int i;

	int start = 0;

	int ret = IWL_INVALID_STATION;

	unsigned long flags;



	if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) ||

	    (priv->iw_mode == NL80211_IFTYPE_AP))

		start = IWL_STA_ID;



	if (is_broadcast_ether_addr(addr))

		return priv->hw_params.bcast_sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	for (i = start; i < priv->hw_params.max_stations; i++)

		if (priv->stations[i].used &&

		    (!compare_ether_addr(priv->stations[i].sta.sta.addr,

					 addr))) {

			ret = i;

			goto out;

		}



	IWL_DEBUG_ASSOC_LIMIT(priv, "can not find STA %pM total %d\n",

			      addr, priv->num_stations);



 out:

	/*

	 * It may be possible that more commands interacting with stations

	 * arrive before we completed processing the adding of

	 * station

	 */

	if (ret != IWL_INVALID_STATION &&

	    (!(priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) ||

	     ((priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) &&

	      (priv->stations[ret].used & IWL_STA_UCODE_INPROGRESS)))) {

		IWL_ERR(priv, "Requested station info for sta %d before ready.\n",

			ret);

		ret = IWL_INVALID_STATION;

	}

	spin_unlock_irqrestore(&priv->sta_lock, flags);

	return ret;

}



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

{

	if (priv->iw_mode == NL80211_IFTYPE_STATION) {

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

+0 −45
Original line number Diff line number Diff line
@@ -35,51 +35,6 @@ 
#include "iwl-core.h"

#include "iwl-sta.h"



u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)

{

	int i;

	int start = 0;

	int ret = IWL_INVALID_STATION;

	unsigned long flags;



	if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) ||

	    (priv->iw_mode == NL80211_IFTYPE_AP))

		start = IWL_STA_ID;



	if (is_broadcast_ether_addr(addr))

		return priv->hw_params.bcast_sta_id;



	spin_lock_irqsave(&priv->sta_lock, flags);

	for (i = start; i < priv->hw_params.max_stations; i++)

		if (priv->stations[i].used &&

		    (!compare_ether_addr(priv->stations[i].sta.sta.addr,

					 addr))) {

			ret = i;

			goto out;

		}



	IWL_DEBUG_ASSOC_LIMIT(priv, "can not find STA %pM total %d\n",

			      addr, priv->num_stations);



 out:

	/*

	 * It may be possible that more commands interacting with stations

	 * arrive before we completed processing the adding of

	 * station

	 */

	if (ret != IWL_INVALID_STATION &&

	    (!(priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) ||

	     ((priv->stations[ret].used & IWL_STA_UCODE_ACTIVE) &&

	      (priv->stations[ret].used & IWL_STA_UCODE_INPROGRESS)))) {

		IWL_ERR(priv, "Requested station info for sta %d before ready.\n",

			ret);

		ret = IWL_INVALID_STATION;

	}

	spin_unlock_irqrestore(&priv->sta_lock, flags);

	return ret;

}

EXPORT_SYMBOL(iwl_find_station);



/* 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 −6
Original line number Diff line number Diff line
@@ -43,12 +43,6 @@ 
#define IWL_STA_BCAST BIT(4) /* this station is the special bcast station */





/**

 * iwl_find_station - Find station id for a given BSSID

 * @bssid: MAC address of station ID to find

 */

u8 iwl_find_station(struct iwl_priv *priv, const u8 *bssid);



int iwl_remove_default_wep_key(struct iwl_priv *priv,

			       struct ieee80211_key_conf *key);

int iwl_set_default_wep_key(struct iwl_priv *priv,