diff options
author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2011-08-26 02:10:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-08-29 15:25:33 -0400 |
commit | 7ff94706a055f3e21710b08ffbe3979d7db615db (patch) | |
tree | 453cabac4b495e4ee8d7fe63a193435e90920883 /drivers/net/wireless/iwlwifi/iwl-core.c | |
parent | 0c325769a394559941acda83e888a1d9b1ef8b7f (diff) |
iwlagn: move the NIC error flow to the transport layer
It is transport dependent, move to the PCIe transport layer.
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-core.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index d77af6969a5b..88fc39619214 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
@@ -902,44 +902,6 @@ void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand) | |||
902 | } | 902 | } |
903 | } | 903 | } |
904 | 904 | ||
905 | /** | ||
906 | * iwl_irq_handle_error - called for HW or SW error interrupt from card | ||
907 | */ | ||
908 | void iwl_irq_handle_error(struct iwl_priv *priv) | ||
909 | { | ||
910 | /* W/A for WiFi/WiMAX coex and WiMAX own the RF */ | ||
911 | if (priv->cfg->internal_wimax_coex && | ||
912 | (!(iwl_read_prph(priv, APMG_CLK_CTRL_REG) & | ||
913 | APMS_CLK_VAL_MRB_FUNC_MODE) || | ||
914 | (iwl_read_prph(priv, APMG_PS_CTRL_REG) & | ||
915 | APMG_PS_CTRL_VAL_RESET_REQ))) { | ||
916 | /* | ||
917 | * Keep the restart process from trying to send host | ||
918 | * commands by clearing the ready bit. | ||
919 | */ | ||
920 | clear_bit(STATUS_READY, &priv->shrd->status); | ||
921 | clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status); | ||
922 | wake_up_interruptible(&priv->wait_command_queue); | ||
923 | IWL_ERR(priv, "RF is used by WiMAX\n"); | ||
924 | return; | ||
925 | } | ||
926 | |||
927 | IWL_ERR(priv, "Loaded firmware version: %s\n", | ||
928 | priv->hw->wiphy->fw_version); | ||
929 | |||
930 | iwl_dump_nic_error_log(priv); | ||
931 | iwl_dump_csr(priv); | ||
932 | iwl_dump_fh(priv, NULL, false); | ||
933 | iwl_dump_nic_event_log(priv, false, NULL, false); | ||
934 | #ifdef CONFIG_IWLWIFI_DEBUG | ||
935 | if (iwl_get_debug_level(priv->shrd) & IWL_DL_FW_ERRORS) | ||
936 | iwl_print_rx_config_cmd(priv, | ||
937 | &priv->contexts[IWL_RXON_CTX_BSS]); | ||
938 | #endif | ||
939 | |||
940 | iwlagn_fw_error(priv, false); | ||
941 | } | ||
942 | |||
943 | static int iwl_apm_stop_master(struct iwl_priv *priv) | 905 | static int iwl_apm_stop_master(struct iwl_priv *priv) |
944 | { | 906 | { |
945 | int ret = 0; | 907 | int ret = 0; |