52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
|
From: Arend van Spriel <arend@broadcom.com>
|
||
|
|
Date: Tue, 14 Apr 2015 20:10:27 +0200
|
||
|
|
Subject: [PATCH] brcmfmac: make scheduled scan support conditional
|
||
|
|
|
||
|
|
The scheduled scan support depends on firmware supporting the PNO
|
||
|
|
feature. This feature is optional so add a feature flag for this
|
||
|
|
in the driver and announce scheduled scan support accordingly.
|
||
|
|
|
||
|
|
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
|
||
|
|
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
|
||
|
|
Signed-off-by: Arend van Spriel <arend@broadcom.com>
|
||
|
|
---
|
||
|
|
|
||
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
|
||
|
|
@@ -5782,7 +5782,8 @@ static int brcmf_setup_wiphy(struct wiph
|
||
|
|
wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
|
||
|
|
wiphy->mgmt_stypes = brcmf_txrx_stypes;
|
||
|
|
wiphy->max_remain_on_channel_duration = 5000;
|
||
|
|
- brcmf_wiphy_pno_params(wiphy);
|
||
|
|
+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO))
|
||
|
|
+ brcmf_wiphy_pno_params(wiphy);
|
||
|
|
|
||
|
|
/* vendor commands/events support */
|
||
|
|
wiphy->vendor_commands = brcmf_vendor_cmds;
|
||
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
|
||
|
|
@@ -124,6 +124,7 @@ void brcmf_feat_attach(struct brcmf_pub
|
||
|
|
struct brcmf_if *ifp = drvr->iflist[0];
|
||
|
|
|
||
|
|
brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan");
|
||
|
|
+ brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_PNO, "pfn");
|
||
|
|
if (drvr->bus_if->wowl_supported)
|
||
|
|
brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
|
||
|
|
if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID)
|
||
|
|
--- a/drivers/net/wireless/brcm80211/brcmfmac/feature.h
|
||
|
|
+++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.h
|
||
|
|
@@ -21,11 +21,13 @@
|
||
|
|
*
|
||
|
|
* MBSS: multiple BSSID support (eg. guest network in AP mode).
|
||
|
|
* MCHAN: multi-channel for concurrent P2P.
|
||
|
|
+ * PNO: preferred network offload.
|
||
|
|
* WOWL: Wake-On-WLAN.
|
||
|
|
*/
|
||
|
|
#define BRCMF_FEAT_LIST \
|
||
|
|
BRCMF_FEAT_DEF(MBSS) \
|
||
|
|
BRCMF_FEAT_DEF(MCHAN) \
|
||
|
|
+ BRCMF_FEAT_DEF(PNO) \
|
||
|
|
BRCMF_FEAT_DEF(WOWL)
|
||
|
|
/*
|
||
|
|
* Quirks:
|