brcmfmac: fix wrong location to get firmware feature (c5767385) · Commits · 戴 / test

sup_wpa feature is getting after setting feature_disable flag. If firmware is supported sup_wpa feature, it's always enabled regardless of feature_disable flag. Fixes: ("brcmfmac: support 4-way handshake offloading for WPA/WPA2-PSK") Signed-off-by:

Jaehoon Chung <jh80.chung@samsung.com> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org> Link: https://lore.kernel.org/r/20200330052528.10503-1-jh80.chung@samsung.com

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -285,13 +285,14 @@ void brcmf_feat_attach(struct brcmf_pub *drvr)
		if (!err)
		ifp->drvr->feat_flags \|= BIT(BRCMF_FEAT_SCAN_RANDOM_MAC);

		brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_FWSUP, "sup_wpa");

		if (drvr->settings->feature_disable) {
		brcmf_dbg(INFO, "Features: 0x%02x, disable: 0x%02x\n",
		ifp->drvr->feat_flags,
		drvr->settings->feature_disable);
		ifp->drvr->feat_flags &= ~drvr->settings->feature_disable;
		}
		brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_FWSUP, "sup_wpa");

		brcmf_feat_firmware_overrides(drvr);

Admin message