From 0cba0b0ea887da85a704d07d82966a49a141177f Mon Sep 17 00:00:00 2001 From: Double Lo Date: Thu, 20 Sep 2018 01:44:01 -0500 Subject: [PATCH 009/296] non-upstream: configure wowl parameters in suspend function only if firmware support wowl This patch removes the redundant wowl configuration for none wowl FW. Signed-off-by: Double Lo Signed-off-by: Chi-hsien Lin --- .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index a13acb8d4ea1..8bbaa284bbfe 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c @@ -4306,11 +4306,13 @@ static s32 brcmf_cfg80211_suspend(struct wiphy *wiphy, brcmf_set_mpc(ifp, 1); } else { - /* Configure WOWL parameters */ - brcmf_configure_wowl(cfg, ifp, wowl); + if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL)) { + /* Configure WOWL parameters */ + brcmf_configure_wowl(cfg, ifp, wowl); - /* Prevent disassociation due to inactivity with keep-alive */ - brcmf_keepalive_start(ifp, 30); + /* Prevent disassociation due to inactivity with keep-alive */ + brcmf_keepalive_start(ifp, 30); + } } exit: -- 2.25.1