diff options
author | Don Fry <donald.h.fry@intel.com> | 2012-03-15 16:27:05 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 16:37:47 -0400 |
commit | 17acd0b64e23d92013621dc2caa3042ce6769770 (patch) | |
tree | a4edbddf9a7a2a8a1b1b2115ac2af248da499e0a /drivers/net/wireless/iwlwifi/iwl-agn.c | |
parent | e3ec26de90c18b1b198f94f5b2444ba48cc6ce2d (diff) |
iwlwifi: move FW_ERROR to priv
The op_mode should check for FW_ERROR before calling send_cmd. This
removes the need to test for FW_ERROR in the trans layer.
Signed-off-by: Don Fry <donald.h.fry@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-agn.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index e91d88d552ad..94af564bb53f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -920,11 +920,10 @@ void iwl_down(struct iwl_priv *priv) | |||
920 | STATUS_RF_KILL_HW | | 920 | STATUS_RF_KILL_HW | |
921 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << | 921 | test_bit(STATUS_GEO_CONFIGURED, &priv->status) << |
922 | STATUS_GEO_CONFIGURED | | 922 | STATUS_GEO_CONFIGURED | |
923 | test_bit(STATUS_FW_ERROR, &priv->status) << | ||
924 | STATUS_FW_ERROR | | ||
923 | test_bit(STATUS_EXIT_PENDING, &priv->status) << | 925 | test_bit(STATUS_EXIT_PENDING, &priv->status) << |
924 | STATUS_EXIT_PENDING; | 926 | STATUS_EXIT_PENDING; |
925 | priv->shrd->status &= | ||
926 | test_bit(STATUS_FW_ERROR, &priv->shrd->status) << | ||
927 | STATUS_FW_ERROR; | ||
928 | 927 | ||
929 | dev_kfree_skb(priv->beacon_skb); | 928 | dev_kfree_skb(priv->beacon_skb); |
930 | priv->beacon_skb = NULL; | 929 | priv->beacon_skb = NULL; |
@@ -1013,7 +1012,7 @@ static void iwl_bg_restart(struct work_struct *data) | |||
1013 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) | 1012 | if (test_bit(STATUS_EXIT_PENDING, &priv->status)) |
1014 | return; | 1013 | return; |
1015 | 1014 | ||
1016 | if (test_and_clear_bit(STATUS_FW_ERROR, &priv->shrd->status)) { | 1015 | if (test_and_clear_bit(STATUS_FW_ERROR, &priv->status)) { |
1017 | mutex_lock(&priv->mutex); | 1016 | mutex_lock(&priv->mutex); |
1018 | iwlagn_prepare_restart(priv); | 1017 | iwlagn_prepare_restart(priv); |
1019 | mutex_unlock(&priv->mutex); | 1018 | mutex_unlock(&priv->mutex); |