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

iwlwifi: move iwl_clear_driver_stations to user 



There's only one place using this function, so
move it where it's needed.

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 e9a8e8ec

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

+35 −0
Original line number Diff line number Diff line
@@ -738,6 +738,41 @@ int iwl_alive_start(struct iwl_priv *priv) 
	return iwl_power_update_mode(priv, true);

}



/**

 * iwl_clear_driver_stations - clear knowledge of all stations from driver

 * @priv: iwl priv struct

 *

 * This is called during iwl_down() to make sure that in the case

 * we're coming there from a hardware restart mac80211 will be

 * able to reconfigure stations -- if we're getting there in the

 * normal down flow then the stations will already be cleared.

 */

static void iwl_clear_driver_stations(struct iwl_priv *priv)

{

	unsigned long flags;

	struct iwl_rxon_context *ctx;



	spin_lock_irqsave(&priv->shrd->sta_lock, flags);

	memset(priv->stations, 0, sizeof(priv->stations));

	priv->num_stations = 0;



	priv->ucode_key_table = 0;



	for_each_context(priv, ctx) {

		/*

		 * Remove all key information that is not stored as part

		 * of station information since mac80211 may not have had

		 * a chance to remove all the keys. When device is

		 * reconfigured by mac80211 after an error all keys will

		 * be reconfigured.

		 */

		memset(ctx->wep_keys, 0, sizeof(ctx->wep_keys));

		ctx->key_mapping_keys = 0;

	}



	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

}



void iwl_down(struct iwl_priv *priv)

{

	int exit_pending;

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

+0 −35
Original line number Diff line number Diff line
@@ -232,41 +232,6 @@ int iwl_add_sta_callback(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb, 
			       struct iwl_device_cmd *cmd);





/**

 * iwl_clear_driver_stations - clear knowledge of all stations from driver

 * @priv: iwl priv struct

 *

 * This is called during iwl_down() to make sure that in the case

 * we're coming there from a hardware restart mac80211 will be

 * able to reconfigure stations -- if we're getting there in the

 * normal down flow then the stations will already be cleared.

 */

static inline void iwl_clear_driver_stations(struct iwl_priv *priv)

{

	unsigned long flags;

	struct iwl_rxon_context *ctx;



	spin_lock_irqsave(&priv->shrd->sta_lock, flags);

	memset(priv->stations, 0, sizeof(priv->stations));

	priv->num_stations = 0;



	priv->ucode_key_table = 0;



	for_each_context(priv, ctx) {

		/*

		 * Remove all key information that is not stored as part

		 * of station information since mac80211 may not have had

		 * a chance to remove all the keys. When device is

		 * reconfigured by mac80211 after an error all keys will

		 * be reconfigured.

		 */

		memset(ctx->wep_keys, 0, sizeof(ctx->wep_keys));

		ctx->key_mapping_keys = 0;

	}



	spin_unlock_irqrestore(&priv->shrd->sta_lock, flags);

}



static inline int iwl_sta_id(struct ieee80211_sta *sta)

{

	if (WARN_ON(!sta))