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

Commit f957dd3c authored by Ian W MORRISON's avatar Ian W MORRISON Committed by Kalle Valo
Browse files

brcmfmac: feature check for multi-scheduled scan fails on bcm4345 devices 



The firmware feature check introduced for multi-scheduled scan is also
failing for bcm4345 devices resulting in a firmware crash.
The reason for this crash has not yet been root cause so this patch avoids
the feature check for those device as a short-term fix.

Fixes: 9fe929aa ("brcmfmac: add firmware feature detection for gscan feature")
Cc: <stable@vger.kernel.org> # v4.13
Signed-off-by: default avatarIan W MORRISON <ianwmorrison@gmail.com>
Acked-by: default avatarArend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 2eabc84d

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

+2 −1
Original line number Diff line number Diff line
@@ -159,7 +159,8 @@ void brcmf_feat_attach(struct brcmf_pub *drvr) 


	brcmf_feat_firmware_capabilities(ifp);

	memset(&gscan_cfg, 0, sizeof(gscan_cfg));

	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID)

	if (drvr->bus_if->chip != BRCM_CC_43430_CHIP_ID &&

	    drvr->bus_if->chip != BRCM_CC_4345_CHIP_ID)

		brcmf_feat_iovar_data_set(ifp, BRCMF_FEAT_GSCAN,

					  "pfn_gscan_cfg",

					  &gscan_cfg, sizeof(gscan_cfg));