iwlwifi: cleanup iwl_recover_from_statistics

No functional change, make recover from statistics code
easies to read.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 12 insertions, 25 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c
index 87a6fd84d4d2..bc89393fb696 100644
--- a/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -234,33 +234,20 @@ EXPORT_SYMBOL(iwl_rx_spectrum_measure_notif);
 void iwl_recover_from_statistics(struct iwl_priv *priv,
                                 struct iwl_rx_packet *pkt)
 {
-        if (test_bit(STATUS_EXIT_PENDING, &priv->status))
+        if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
+            !iwl_is_any_associated(priv))
                 return;
-        if (iwl_is_any_associated(priv)) {
-                if (priv->cfg->ops->lib->check_ack_health) {
-                        if (!priv->cfg->ops->lib->check_ack_health(
-                            priv, pkt)) {
-                                /*
-                                 * low ack count detected
-                                 * restart Firmware
-                                 */
-                                IWL_ERR(priv, "low ack count detected, "
-                                        "restart firmware\n");
-                                if (!iwl_force_reset(priv, IWL_FW_RESET, false))
-                                        return;
-                        }
-                }
-                if (priv->cfg->ops->lib->check_plcp_health) {
-                        if (!priv->cfg->ops->lib->check_plcp_health(
-                            priv, pkt)) {
-                                /*
-                                 * high plcp error detected
-                                 * reset Radio
-                                 */
-                                iwl_force_reset(priv, IWL_RF_RESET, false);
-                        }
-                }
+
+        if (priv->cfg->ops->lib->check_ack_health &&
+            !priv->cfg->ops->lib->check_ack_health(priv, pkt)) {
+                IWL_ERR(priv, "low ack count detected, restart firmware\n");
+                if (!iwl_force_reset(priv, IWL_FW_RESET, false))
+                        return;
         }
+
+        if (priv->cfg->ops->lib->check_plcp_health &&
+            !priv->cfg->ops->lib->check_plcp_health(priv, pkt))
+                iwl_force_reset(priv, IWL_RF_RESET, false);
 }
 EXPORT_SYMBOL(iwl_recover_from_statistics);