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

Commit 955570fc authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: move iwl_sta_id_or_broadcast to user 



There's only one user, so the function
can be moved into the correct file. It
also loses an argument along the way.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9b6ca448

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

+30 −1
Original line number Diff line number Diff line
@@ -248,6 +248,35 @@ static void iwlagn_tx_cmd_build_hwcrypto(struct iwl_priv *priv, 
	}

}



/**

 * iwl_sta_id_or_broadcast - return sta_id or broadcast sta

 * @context: the current context

 * @sta: mac80211 station

 *

 * In certain circumstances mac80211 passes a station pointer

 * that may be %NULL, for example during TX or key setup. In

 * that case, we need to use the broadcast station, so this

 * inline wraps that pattern.

 */

static int iwl_sta_id_or_broadcast(struct iwl_rxon_context *context,

				   struct ieee80211_sta *sta)

{

	int sta_id;



	if (!sta)

		return context->bcast_sta_id;



	sta_id = iwl_sta_id(sta);



	/*

	 * mac80211 should not be passing a partially

	 * initialised station!

	 */

	WARN_ON(sta_id == IWL_INVALID_STATION);



	return sta_id;

}



/*

 * start REPLY_TX command process

 */
@@ -304,7 +333,7 @@ int iwlagn_tx_skb(struct iwl_priv *priv, struct sk_buff *skb) 
		sta_id = ctx->bcast_sta_id;

	else {

		/* Find index into station table for destination station */

		sta_id = iwl_sta_id_or_broadcast(priv, ctx, info->control.sta);

		sta_id = iwl_sta_id_or_broadcast(ctx, info->control.sta);

		if (sta_id == IWL_INVALID_STATION) {

			IWL_DEBUG_DROP(priv, "Dropping - INVALID STATION: %pM\n",

				       hdr->addr1);

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

+0 −31
Original line number Diff line number Diff line
@@ -258,37 +258,6 @@ static inline int iwl_sta_id(struct ieee80211_sta *sta) 
	return ((struct iwl_station_priv *)sta->drv_priv)->sta_id;

}



/**

 * iwl_sta_id_or_broadcast - return sta_id or broadcast sta

 * @priv: iwl priv

 * @context: the current context

 * @sta: mac80211 station

 *

 * In certain circumstances mac80211 passes a station pointer

 * that may be %NULL, for example during TX or key setup. In

 * that case, we need to use the broadcast station, so this

 * inline wraps that pattern.

 */

static inline int iwl_sta_id_or_broadcast(struct iwl_priv *priv,

					  struct iwl_rxon_context *context,

					  struct ieee80211_sta *sta)

{

	int sta_id;



	if (!sta)

		return context->bcast_sta_id;



	sta_id = iwl_sta_id(sta);



	/*

	 * mac80211 should not be passing a partially

	 * initialised station!

	 */

	WARN_ON(sta_id == IWL_INVALID_STATION);



	return sta_id;

}



int iwlagn_alloc_bcast_station(struct iwl_priv *priv,

			       struct iwl_rxon_context *ctx);

int iwlagn_add_bssid_station(struct iwl_priv *priv, struct iwl_rxon_context *ctx,