2 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 02387430f7fe..7d40e2d42873 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -389,11 +389,9 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)
          * AP station must be done after the BSSID is set to correctly
          * set up filters in the device.
          */
-        if ((old_assoc && new_assoc) || !new_assoc) {
-                ret = iwlagn_rxon_disconn(priv, ctx);
-                if (ret)
-                        return ret;
-        }
+        ret = iwlagn_rxon_disconn(priv, ctx);
+        if (ret)
+                return ret;
 
         if (new_assoc)
                 return iwlagn_rxon_connect(priv, ctx);
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 2f6b38cfcc13..54a935ff38fa 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -582,6 +582,11 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
         int trace_idx;
 #endif
 
+        if (test_bit(STATUS_FW_ERROR, &priv->status)) {
+                IWL_WARN(priv, "fw recovery, no hcmd send\n");
+                return -EIO;
+        }
+
         copy_size = sizeof(out_cmd->hdr);
         cmd_size = sizeof(out_cmd->hdr);