brcmfmac: fix handling firmware results for wowl netdetect
authorArend Van Spriel <arend.vanspriel@broadcom.com>
Fri, 27 Jan 2017 12:27:46 +0000 (12:27 +0000)
committerKalle Valo <kvalo@codeaurora.org>
Tue, 31 Jan 2017 07:24:58 +0000 (09:24 +0200)
For wowl netdetect the event data changed for newer chips. This
was recently fixed for scheduled scan, but same change is needed
for wowl netdetect. Removing now pointles += operation from both
result handlers.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index 302a78deeff14c846fa72597aae851671065e719..c81d78ff0113d756f541b5dd45576f2dbc297260 100644 (file)
@@ -3330,7 +3330,6 @@ brcmf_notify_sched_scan_results(struct brcmf_if *ifp,
                goto out_err;
        }
 
-       data += sizeof(struct brcmf_pno_scanresults_le);
        netinfo_start = brcmf_get_netinfo_array(pfn_result);
 
        for (i = 0; i < result_count; i++) {
@@ -3478,8 +3477,7 @@ brcmf_wowl_nd_results(struct brcmf_if *ifp, const struct brcmf_event_msg *e,
                return -EINVAL;
        }
 
-       data += sizeof(struct brcmf_pno_scanresults_le);
-       netinfo = (struct brcmf_pno_net_info_le *)data;
+       netinfo = brcmf_get_netinfo_array(pfn_result);
        memcpy(cfg->wowl.nd->ssid.ssid, netinfo->SSID, netinfo->SSID_len);
        cfg->wowl.nd->ssid.ssid_len = netinfo->SSID_len;
        cfg->wowl.nd->n_channels = 1;