aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl4965-base.c
diff options
context:
space:
mode:
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>2008-06-30 05:23:08 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-06-30 17:37:39 -0400
commit37deb2a0baf1bb540b723cc8a3972b42ff2daac6 (patch)
treebd5b29719cdf1fd39e3ff805a43252b8111c804e /drivers/net/wireless/iwlwifi/iwl4965-base.c
parent8f91aecb4cdc2d786df8941e827b9dff3c10a4e4 (diff)
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: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Zhu Yi <yi.zhu@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl4965-base.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl4965-base.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 13d53f3009d8..a607b39223e7 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -320,7 +320,7 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
320 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon)); 320 memcpy(active_rxon, &priv->staging_rxon, sizeof(*active_rxon));
321 } 321 }
322 322
323 iwlcore_clear_stations_table(priv); 323 iwl_clear_stations_table(priv);
324 324
325 if (!priv->error_recovering) 325 if (!priv->error_recovering)
326 priv->start_calib = 0; 326 priv->start_calib = 0;
@@ -841,7 +841,7 @@ static int iwl4965_set_mode(struct iwl_priv *priv, int mode)
841 iwl4965_connection_init_rx_config(priv); 841 iwl4965_connection_init_rx_config(priv);
842 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN); 842 memcpy(priv->staging_rxon.node_addr, priv->mac_addr, ETH_ALEN);
843 843
844 iwlcore_clear_stations_table(priv); 844 iwl_clear_stations_table(priv);
845 845
846 /* dont commit rxon if rf-kill is on*/ 846 /* dont commit rxon if rf-kill is on*/
847 if (!iwl_is_ready_rf(priv)) 847 if (!iwl_is_ready_rf(priv))
@@ -2150,7 +2150,7 @@ static void iwl_alive_start(struct iwl_priv *priv)
2150 goto restart; 2150 goto restart;
2151 } 2151 }
2152 2152
2153 iwlcore_clear_stations_table(priv); 2153 iwl_clear_stations_table(priv);
2154 ret = priv->cfg->ops->lib->alive_notify(priv); 2154 ret = priv->cfg->ops->lib->alive_notify(priv);
2155 if (ret) { 2155 if (ret) {
2156 IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n", 2156 IWL_WARNING("Could not complete ALIVE transition [ntf]: %d\n",
@@ -2228,7 +2228,7 @@ static void __iwl4965_down(struct iwl_priv *priv)
2228 2228
2229 iwl_leds_unregister(priv); 2229 iwl_leds_unregister(priv);
2230 2230
2231 iwlcore_clear_stations_table(priv); 2231 iwl_clear_stations_table(priv);
2232 2232
2233 /* Unblock any waiting calls */ 2233 /* Unblock any waiting calls */
2234 wake_up_interruptible_all(&priv->wait_command_queue); 2234 wake_up_interruptible_all(&priv->wait_command_queue);
@@ -2390,7 +2390,7 @@ static int __iwl4965_up(struct iwl_priv *priv)
2390 2390
2391 for (i = 0; i < MAX_HW_RESTARTS; i++) { 2391 for (i = 0; i < MAX_HW_RESTARTS; i++) {
2392 2392
2393 iwlcore_clear_stations_table(priv); 2393 iwl_clear_stations_table(priv);
2394 2394
2395 /* load bootstrap state machine, 2395 /* load bootstrap state machine,
2396 * load bootstrap program into processor's memory, 2396 * load bootstrap program into processor's memory,
@@ -4530,7 +4530,7 @@ static void __devexit iwl4965_pci_remove(struct pci_dev *pdev)
4530 iwl_rx_queue_free(priv, &priv->rxq); 4530 iwl_rx_queue_free(priv, &priv->rxq);
4531 iwl_hw_txq_ctx_free(priv); 4531 iwl_hw_txq_ctx_free(priv);
4532 4532
4533 iwlcore_clear_stations_table(priv); 4533 iwl_clear_stations_table(priv);
4534 iwl_eeprom_free(priv); 4534 iwl_eeprom_free(priv);
4535 4535
4536 4536