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

Commit 37deb2a0 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: don't send REPLY_REMOVE_ALL_STA upon exit 



This patch avoids sending REPLY_REMOVE_ALL_STA in down flow, this avoids a
meaningless warning from being printed
On the way this patch also renames the the function to
iwl_clear_stations_table

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8f91aecb

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

+1 −1
Original line number Diff line number Diff line
@@ -675,7 +675,7 @@ static void iwl5000_init_alive_start(struct iwl_priv *priv) 
		goto restart;

	}



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);

	ret = priv->cfg->ops->lib->alive_notify(priv);

	if (ret) {

		IWL_WARNING("Could not complete ALIVE transition: %d\n", ret);

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

+7 −6
Original line number Diff line number Diff line
@@ -273,26 +273,27 @@ int iwl_hw_nic_init(struct iwl_priv *priv) 
EXPORT_SYMBOL(iwl_hw_nic_init);



/**

 * iwlcore_clear_stations_table - Clear the driver's station table

 * iwl_clear_stations_table - Clear the driver's station table

 *

 * NOTE:  This does not clear or otherwise alter the device's station table.

 */

void iwlcore_clear_stations_table(struct iwl_priv *priv)

void iwl_clear_stations_table(struct iwl_priv *priv)

{

	unsigned long flags;



	spin_lock_irqsave(&priv->sta_lock, flags);



	priv->num_stations = 0;

	if (iwl_is_alive(priv) &&

	   !test_bit(STATUS_EXIT_PENDING, &priv->status) &&

	   iwl_send_cmd_pdu_async(priv, REPLY_REMOVE_ALL_STA, 0, NULL, NULL))

		IWL_ERROR("Couldn't clear the station table\n");



	priv->num_stations = 0;

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



	spin_unlock_irqrestore(&priv->sta_lock, flags);

}

EXPORT_SYMBOL(iwlcore_clear_stations_table);

EXPORT_SYMBOL(iwl_clear_stations_table);



void iwl_reset_qos(struct iwl_priv *priv)

{
@@ -864,7 +865,7 @@ int iwl_init_drv(struct iwl_priv *priv) 
	mutex_init(&priv->mutex);



	/* Clear the driver's (not device's) station table */

	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);



	priv->data_retry_limit = -1;

	priv->ieee_channels = NULL;

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

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ struct ieee80211_hw *iwl_alloc_all(struct iwl_cfg *cfg, 
		struct ieee80211_ops *hw_ops);

void iwl_hw_detect(struct iwl_priv *priv);



void iwlcore_clear_stations_table(struct iwl_priv *priv);

void iwl_clear_stations_table(struct iwl_priv *priv);

void iwl_free_calib_results(struct iwl_priv *priv);

void iwl_reset_qos(struct iwl_priv *priv);

void iwl_set_rxon_chain(struct iwl_priv *priv);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+6 −6
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv) 
		memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));

	}



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);



	if (!priv->error_recovering)

		priv->start_calib = 0;
@@ -841,7 +841,7 @@ static int iwl4965_set_mode(struct iwl_priv *priv, int mode) 
	iwl4965_connection_init_rx_config(priv);

	memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);



	/* dont commit rxon if rf-kill is on*/

	if (!iwl_is_ready_rf(priv))
@@ -2150,7 +2150,7 @@ static void iwl_alive_start(struct iwl_priv *priv) 
		goto restart;

	}



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);

	ret = priv->cfg->ops->lib->alive_notify(priv);

	if (ret) {

		IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n",
@@ -2228,7 +2228,7 @@ static void __iwl4965_down(struct iwl_priv *priv) 


	iwl_leds_unregister(priv);



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);



	/* Unblock any waiting calls */

	wake_up_interruptible_all(&priv->wait_command_queue);
@@ -2390,7 +2390,7 @@ static int __iwl4965_up(struct iwl_priv *priv) 


	for (i = 0; i < MAX_HW_RESTARTS; i++) {



		iwlcore_clear_stations_table(priv);

		iwl_clear_stations_table(priv);



		/* load bootstrap state machine,

		 * load bootstrap program into processor's memory,
@@ -4530,7 +4530,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev) 
		iwl_rx_queue_free(priv, &priv->rxq);

	iwl_hw_txq_ctx_free(priv);



	iwlcore_clear_stations_table(priv);

	iwl_clear_stations_table(priv);

	iwl_eeprom_free(priv);