aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl4965-base.c
diff options
context:
space:
mode:
authorEster Kummer <ester.kummer@intel.com>2008-05-05 23:05:14 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-05-14 16:29:48 -0400
commit3a1081e84b0008de8171a95f2c0fff8489af4300 (patch)
treebc19821cb8912d619c4c13815816bee93327a471 /drivers/net/wireless/iwlwifi/iwl4965-base.c
parentbc6f59bc9b2f494ca1b018622f1fbd25933bc920 (diff)
iwlwifi: adding parameter of fw_restart
This patch adds a module parameter of fw_restart which determine if the uCode will be restarted or not in case of error. Signed-off-by: Ester Kummer <ester.kummer@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@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.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c
index 7708b19ca0cc..55ca752ae9e6 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -3569,7 +3569,8 @@ static void iwl4965_irq_handle_error(struct iwl_priv *priv)
3569 sizeof(priv->recovery_rxon)); 3569 sizeof(priv->recovery_rxon));
3570 priv->error_recovering = 1; 3570 priv->error_recovering = 1;
3571 } 3571 }
3572 queue_work(priv->workqueue, &priv->restart); 3572 if (priv->cfg->mod_params->restart_fw)
3573 queue_work(priv->workqueue, &priv->restart);
3573 } 3574 }
3574} 3575}
3575 3576
@@ -6847,6 +6848,7 @@ static int __init iwl4965_init(void)
6847 6848
6848 return ret; 6849 return ret;
6849 6850
6851
6850#ifdef CONFIG_IWLWIFI_DEBUG 6852#ifdef CONFIG_IWLWIFI_DEBUG
6851 pci_unregister_driver(&iwl_driver); 6853 pci_unregister_driver(&iwl_driver);
6852#endif 6854#endif