Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d29afe91 authored by Arend Van Spriel's avatar Arend Van Spriel Committed by Kalle Valo
Browse files

brcmfmac: fix handling firmware results for wowl netdetect 



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: default avatarHante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: default avatarFranky Lin <franky.lin@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2ef03590

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+1 −3
Original line number Diff line number Diff line
@@ -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;