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

Commit 3a1081e8 authored by Ester Kummer's avatar Ester Kummer Committed by John W. Linville
Browse files

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: default avatarEster Kummer <ester.kummer@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent bc6f59bc

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

+3 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ static struct iwl_mod_params iwl4965_mod_params = { 
	.num_of_queues = IWL49_NUM_QUEUES,

	.enable_qos = 1,

	.amsdu_size_8K = 1,

	.restart_fw = 1,

	/* the rest are 0 by default */

};
@@ -3892,4 +3893,5 @@ module_param_named(qos_enable, iwl4965_mod_params.enable_qos, int, 0444); 
MODULE_PARM_DESC(qos_enable, "enable all QoS functionality");

module_param_named(amsdu_size_8K, iwl4965_mod_params.amsdu_size_8K, int, 0444);

MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size");

module_param_named(fw_restart4965, iwl4965_mod_params.restart_fw, int, 0444);

MODULE_PARM_DESC(fw_restart4965, "restart firmware in case of error");

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

+3 −2
Original line number Diff line number Diff line
@@ -510,6 +510,7 @@ static struct iwl_mod_params iwl50_mod_params = { 
	.num_of_queues = IWL50_NUM_QUEUES,

	.enable_qos = 1,

	.amsdu_size_8K = 1,

	.restart_fw = 1,

	/* the rest are 0 by default */

};
@@ -555,5 +556,5 @@ module_param_named(qos_enable50, iwl50_mod_params.enable_qos, int, 0444); 
MODULE_PARM_DESC(qos_enable50, "enable all 50XX QoS functionality");

module_param_named(amsdu_size_8K50, iwl50_mod_params.amsdu_size_8K, int, 0444);

MODULE_PARM_DESC(amsdu_size_8K50, "enable 8K amsdu size in 50XX series");



module_param_named(fw_restart50, iwl50_mod_params.restart_fw, int, 0444);

MODULE_PARM_DESC(fw_restart50, "restart firmware in case of error");

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

+1 −0
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ struct iwl_mod_params { 
	int enable_qos;		/* def: 1 = use quality of service */

	int amsdu_size_8K;	/* def: 1 = enable 8K amsdu size */

	int antenna;  		/* def: 0 = both antennas (use diversity) */

	int restart_fw;		/* def: 1 = restart firmware */

};



struct iwl_cfg {

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

+3 −1
Original line number Diff line number Diff line
@@ -3569,6 +3569,7 @@ static void iwl4965_irq_handle_error(struct iwl_priv *priv) 
			       sizeof(priv->recovery_rxon));

			priv->error_recovering = 1;

		}

		if (priv->cfg->mod_params->restart_fw)

			queue_work(priv->workqueue, &priv->restart);

	}

}
@@ -6847,6 +6848,7 @@ static int __init iwl4965_init(void) 


	return ret;





#ifdef CONFIG_IWLWIFI_DEBUG

	pci_unregister_driver(&iwl_driver);

#endif