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

This project is archived. Its data is read-only.

Commit b7a79404 authored Sep 25, 2009 by Reinette Chatre Committed by John W. Linville Sep 28, 2009

iwlwifi: fix 3945 ucode info retrieval after failure

When hardware or uCode problem occurs driver captures significant
information from device to enable debugging. The format of this information
is different between 3945 and 4965 and later devices, yet currently the
3945 uses the 4965 and later format. Fix this by adding a new library call
that is initialized to the correct formatting routine based on device.

This moves the iwlagn event and error log handling back to iwl-agn.c to
make it part of iwlagn module.

Also remove the 3945 sysfs file that triggers dump of event log - there is
already a debugfs file that can do it for all drivers.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 28142986

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,8 @@ static struct iwl_lib_ops iwl1000_lib = {
		.setup_deferred_work = iwl5000_setup_deferred_work,
		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
		.load_ucode = iwl5000_load_ucode,
		.dump_nic_event_log = iwl_dump_nic_event_log,
		.dump_nic_error_log = iwl_dump_nic_error_log,
		.init_alive_start = iwl5000_init_alive_start,
		.alive_notify = iwl5000_alive_notify,
		.send_tx_power = iwl5000_send_tx_power,

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2839,6 +2839,8 @@ static struct iwl_lib_ops iwl3945_lib = {
		.txq_free_tfd = iwl3945_hw_txq_free_tfd,
		.txq_init = iwl3945_hw_tx_queue_init,
		.load_ucode = iwl3945_load_bsm,
		.dump_nic_event_log = iwl3945_dump_nic_event_log,
		.dump_nic_error_log = iwl3945_dump_nic_error_log,
		.apm_ops = {
		.init = iwl3945_apm_init,
		.reset = iwl3945_apm_reset,

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -209,6 +209,8 @@ extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv,
		struct iwl_host_cmd *cmd);
		extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
		struct ieee80211_hdr *hdr,int left);
		extern void iwl3945_dump_nic_event_log(struct iwl_priv *priv);
		extern void iwl3945_dump_nic_error_log(struct iwl_priv *priv);

		/*
		* Currently used by iwl-3945-rs... look at restructuring so that it doesn't

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -2298,6 +2298,8 @@ static struct iwl_lib_ops iwl4965_lib = {
		.alive_notify = iwl4965_alive_notify,
		.init_alive_start = iwl4965_init_alive_start,
		.load_ucode = iwl4965_load_bsm,
		.dump_nic_event_log = iwl_dump_nic_event_log,
		.dump_nic_error_log = iwl_dump_nic_error_log,
		.apm_ops = {
		.init = iwl4965_apm_init,
		.reset = iwl4965_apm_reset,

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -1535,6 +1535,8 @@ struct iwl_lib_ops iwl5000_lib = {
		.rx_handler_setup = iwl5000_rx_handler_setup,
		.setup_deferred_work = iwl5000_setup_deferred_work,
		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
		.dump_nic_event_log = iwl_dump_nic_event_log,
		.dump_nic_error_log = iwl_dump_nic_error_log,
		.load_ucode = iwl5000_load_ucode,
		.init_alive_start = iwl5000_init_alive_start,
		.alive_notify = iwl5000_alive_notify,
		@@ -1585,6 +1587,8 @@ static struct iwl_lib_ops iwl5150_lib = {
		.rx_handler_setup = iwl5000_rx_handler_setup,
		.setup_deferred_work = iwl5000_setup_deferred_work,
		.is_valid_rtc_data_addr = iwl5000_hw_valid_rtc_data_addr,
		.dump_nic_event_log = iwl_dump_nic_event_log,
		.dump_nic_error_log = iwl_dump_nic_error_log,
		.load_ucode = iwl5000_load_ucode,
		.init_alive_start = iwl5000_init_alive_start,
		.alive_notify = iwl5000_alive_notify,