add chaos_calmer branch
[15.05/openwrt.git] / package / kernel / mac80211 / patches / 357-brcmfmac-make-scheduled-scan-support-conditional.patch
1 From: Arend van Spriel <arend@broadcom.com>
2 Date: Tue, 14 Apr 2015 20:10:27 +0200
3 Subject: [PATCH] brcmfmac: make scheduled scan support conditional
4
5 The scheduled scan support depends on firmware supporting the PNO
6 feature. This feature is optional so add a feature flag for this
7 in the driver and announce scheduled scan support accordingly.
8
9 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
11 Signed-off-by: Arend van Spriel <arend@broadcom.com>
12 ---
13
14 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
16 @@ -5782,7 +5782,8 @@ static int brcmf_setup_wiphy(struct wiph
17                 wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
18         wiphy->mgmt_stypes = brcmf_txrx_stypes;
19         wiphy->max_remain_on_channel_duration = 5000;
20 -       brcmf_wiphy_pno_params(wiphy);
21 +       if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO))
22 +               brcmf_wiphy_pno_params(wiphy);
23  
24         /* vendor commands/events support */
25         wiphy->vendor_commands = brcmf_vendor_cmds;
26 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.c
27 +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.c
28 @@ -124,6 +124,7 @@ void brcmf_feat_attach(struct brcmf_pub
29         struct brcmf_if *ifp = drvr->iflist[0];
30  
31         brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MCHAN, "mchan");
32 +       brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_PNO, "pfn");
33         if (drvr->bus_if->wowl_supported)
34                 brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
35         if (drvr->bus_if->chip != BRCM_CC_43362_CHIP_ID)
36 --- a/drivers/net/wireless/brcm80211/brcmfmac/feature.h
37 +++ b/drivers/net/wireless/brcm80211/brcmfmac/feature.h
38 @@ -21,11 +21,13 @@
39   *
40   * MBSS: multiple BSSID support (eg. guest network in AP mode).
41   * MCHAN: multi-channel for concurrent P2P.
42 + * PNO: preferred network offload.
43   * WOWL: Wake-On-WLAN.
44   */
45  #define BRCMF_FEAT_LIST \
46         BRCMF_FEAT_DEF(MBSS) \
47         BRCMF_FEAT_DEF(MCHAN) \
48 +       BRCMF_FEAT_DEF(PNO) \
49         BRCMF_FEAT_DEF(WOWL)
50  /*
51   * Quirks: