mac80211: brcm: fix warning on ARCH_BCM2835

[openwrt/staging/blocktrron.git] / package / kernel / mac80211 / patches / brcm / 865-brcmfmac-disable-dump_survey-on-bcm2835.patch

diff --git a/package/kernel/mac80211/patches/brcm/865-brcmfmac-disable-dump_survey-on-bcm2835.patch b/package/kernel/mac80211/patches/brcm/865-brcmfmac-disable-dump_survey-on-bcm2835.patch
index e4d9270ce8871abab8ef37fe3c85b1790f037257..bb87c69ff3832ec1f452063b03144de16fd51bf5 100644 (file)
--- a/package/kernel/mac80211/patches/brcm/865-brcmfmac-disable-dump_survey-on-bcm2835.patch
+++ b/package/kernel/mac80211/patches/brcm/865-brcmfmac-disable-dump_survey-on-bcm2835.patch
@@ -9,7 +9,23 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -8361,8 +8361,10 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -7987,6 +7987,7 @@ static s32 brcmf_translate_country_code(
+       return 0;
+ }
+ 
++#if !defined(CONFIG_ARCH_BCM2835)
+ static int
+ brcmf_parse_dump_obss(char *buf, struct brcmf_dump_survey *survey)
+ {
+@@ -8209,6 +8210,7 @@ exit:
+               brcmf_set_mpc(ifp, 1);
+       return err;
+ }
++#endif /* CONFIG_ARCH_BCM2835 */
+ 
+ static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
+                                       struct regulatory_request *req)
+@@ -8361,8 +8363,10 @@ struct brcmf_cfg80211_info *brcmf_cfg802
        if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
                ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
  #endif