Commit 97ed15c7 authored by Arend van Spriel's avatar Arend van Spriel Committed by John W. Linville

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: default avatarHante Meuleman <meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 4f6e1caf
...@@ -2871,6 +2871,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv, ...@@ -2871,6 +2871,7 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv,
u32 bi_length; u32 bi_length;
struct brcmf_scan_results *list; struct brcmf_scan_results *list;
u32 i; u32 i;
bool aborted;
status = be32_to_cpu(e->status); status = be32_to_cpu(e->status);
...@@ -2943,16 +2944,9 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv, ...@@ -2943,16 +2944,9 @@ brcmf_cfg80211_escan_handler(struct brcmf_cfg80211_priv *cfg_priv,
cfg_priv->bss_list = (struct brcmf_scan_results *) cfg_priv->bss_list = (struct brcmf_scan_results *)
cfg_priv->escan_info.escan_buf; cfg_priv->escan_info.escan_buf;
brcmf_inform_bss(cfg_priv); brcmf_inform_bss(cfg_priv);
if (status == BRCMF_E_STATUS_SUCCESS) { aborted = status != BRCMF_E_STATUS_SUCCESS;
WL_SCAN("ESCAN Completed\n"); brcmf_notify_escan_complete(cfg_priv, ndev, aborted,
brcmf_notify_escan_complete(cfg_priv, ndev, false);
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);
} else } else
WL_ERR("Unexpected scan result 0x%x\n", status); WL_ERR("Unexpected scan result 0x%x\n", status);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment