| From b5bee4de307b89742ef9a524da7ef44d32f771ab Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 30 Mar 2020 14:25:28 +0900 |
| Subject: brcmfmac: fix wrong location to get firmware feature |
| |
| From: Jaehoon Chung <jh80.chung@samsung.com> |
| |
| [ Upstream commit c57673852062428cdeabdd6501ac8b8e4c302067 ] |
| |
| 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: b8a64f0e96c2 ("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 |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c |
| index 5da0dda0d899..0dcefbd0c000 100644 |
| --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c |
| +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c |
| @@ -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); |
| |
| -- |
| 2.25.1 |
| |
