diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-3945.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl3945-base.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl4965-base.c | 3 |
4 files changed, 2 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.h b/drivers/net/wireless/iwlwifi/iwl-3945.h index dde389d3163..d36ae0045c5 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.h +++ b/drivers/net/wireless/iwlwifi/iwl-3945.h | |||
@@ -800,7 +800,6 @@ struct iwl3945_priv { | |||
800 | struct iwl3945_tx_queue txq[IWL_MAX_NUM_QUEUES]; | 800 | struct iwl3945_tx_queue txq[IWL_MAX_NUM_QUEUES]; |
801 | 801 | ||
802 | unsigned long status; | 802 | unsigned long status; |
803 | u32 config; | ||
804 | 803 | ||
805 | int last_rx_rssi; /* From Rx packet statisitics */ | 804 | int last_rx_rssi; /* From Rx packet statisitics */ |
806 | int last_rx_noise; /* From beacon statistics */ | 805 | int last_rx_noise; /* From beacon statistics */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.h b/drivers/net/wireless/iwlwifi/iwl-4965.h index ce17e4fec83..cc0745bfd1f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.h +++ b/drivers/net/wireless/iwlwifi/iwl-4965.h | |||
@@ -1104,7 +1104,6 @@ struct iwl4965_priv { | |||
1104 | u32 scd_base_addr; /* scheduler sram base address */ | 1104 | u32 scd_base_addr; /* scheduler sram base address */ |
1105 | 1105 | ||
1106 | unsigned long status; | 1106 | unsigned long status; |
1107 | u32 config; | ||
1108 | 1107 | ||
1109 | int last_rx_rssi; /* From Rx packet statisitics */ | 1108 | int last_rx_rssi; /* From Rx packet statisitics */ |
1110 | int last_rx_noise; /* From beacon statistics */ | 1109 | int last_rx_noise; /* From beacon statistics */ |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 0fab832ce8c..139a4a24bc0 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
@@ -4506,8 +4506,7 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv) | |||
4506 | 4506 | ||
4507 | if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { | 4507 | if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { |
4508 | IWL_ERROR("Start IWL Error Log Dump:\n"); | 4508 | IWL_ERROR("Start IWL Error Log Dump:\n"); |
4509 | IWL_ERROR("Status: 0x%08lX, Config: %08X count: %d\n", | 4509 | IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count); |
4510 | priv->status, priv->config, count); | ||
4511 | } | 4510 | } |
4512 | 4511 | ||
4513 | IWL_ERROR("Desc Time asrtPC blink2 " | 4512 | IWL_ERROR("Desc Time asrtPC blink2 " |
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl4965-base.c index 20d012d4f37..99a9f820bfd 100644 --- a/drivers/net/wireless/iwlwifi/iwl4965-base.c +++ b/drivers/net/wireless/iwlwifi/iwl4965-base.c | |||
@@ -4886,8 +4886,7 @@ static void iwl4965_dump_nic_error_log(struct iwl4965_priv *priv) | |||
4886 | 4886 | ||
4887 | if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { | 4887 | if (ERROR_START_OFFSET <= count * ERROR_ELEM_SIZE) { |
4888 | IWL_ERROR("Start IWL Error Log Dump:\n"); | 4888 | IWL_ERROR("Start IWL Error Log Dump:\n"); |
4889 | IWL_ERROR("Status: 0x%08lX, Config: %08X count: %d\n", | 4889 | IWL_ERROR("Status: 0x%08lX, count: %d\n", priv->status, count); |
4890 | priv->status, priv->config, count); | ||
4891 | } | 4890 | } |
4892 | 4891 | ||
4893 | desc = iwl4965_read_targ_mem(priv, base + 1 * sizeof(u32)); | 4892 | desc = iwl4965_read_targ_mem(priv, base + 1 * sizeof(u32)); |