mac80211: update brcmfmac including missing boardrev workaround
[openwrt.git] / package / kernel / mac80211 / patches / 344-0003-brcmfmac-check-for-wowl-support-before-enumerating-f.patch
1 From: Franky Lin <frankyl@broadcom.com>
2 Date: Wed, 17 Feb 2016 11:26:52 +0100
3 Subject: [PATCH] brcmfmac: check for wowl support before enumerating feature
4  flag
5
6 In some cases wiphy->wowlan could be NULL if firmware doesn't have the
7 support. Driver should check for support before walking down the feature
8 flags.
9
10 Reviewed-by: Arend Van Spriel <arend@broadcom.com>
11 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
12 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
13 Signed-off-by: Franky Lin <frankyl@broadcom.com>
14 Signed-off-by: Arend van Spriel <arend@broadcom.com>
15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
16 ---
17
18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
20 @@ -6594,7 +6594,8 @@ struct brcmf_cfg80211_info *brcmf_cfg802
21         if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SCAN_RANDOM_MAC)) {
22                 wiphy->features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR;
23  #ifdef CONFIG_PM
24 -               if (wiphy->wowlan->flags & WIPHY_WOWLAN_NET_DETECT)
25 +               if (wiphy->wowlan &&
26 +                   wiphy->wowlan->flags & WIPHY_WOWLAN_NET_DETECT)
27                         wiphy->features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;
28  #endif
29         }