brcmfmac: simplify handling e-scan result firmware event

Upon handling an e-scan result event from the firmware in
brcmf_cfg80211_escan_handler() the status may indicate e-scan
is completed or aborted. If so brcmf_notify_escan_complete()
is called. However, that function and brcmf_cfg80211_escan_handler()
both log the same debug message and both enable MPC flag in the
firmware.

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index 65cf8f92cb3e1407b1ec26389d74335efc66f0ee..3491086053cddf960a0e36e3224f3741f68495e6 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -2871,6 +2871,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv,
        u32 bi_length;
        struct brcmf_scan_results *list;
        u32 i;
+       bool aborted;
 
        status = be32_to_cpu(e->status);
 
@@ -2943,16 +2944,9 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv,
                        cfg_priv->bss_list = (struct brcmf_scan_results *)
                                cfg_priv->escan_info.escan_buf;
                        brcmf_inform_bss(cfg_priv);
-                       if (status == BRCMF_E_STATUS_SUCCESS) {
-                               WL_SCAN("ESCAN Completed\n");
-                               brcmf_notify_escan_complete(cfg_priv, ndev,
-                                       false, false);
-                       } else {
-                               WL_ERR("ESCAN Aborted, Event 0x%x\n", status);
-                               brcmf_notify_escan_complete(cfg_priv, ndev,
-                                       true, false);
-                       }
-                       brcmf_set_mpc(ndev, 1);
+                       aborted = status != BRCMF_E_STATUS_SUCCESS;
+                       brcmf_notify_escan_complete(cfg_priv, ndev, aborted,
+                                                   false);
                } else
                        WL_ERR("Unexpected scan result 0x%x\n", status);
        }