|
@@ -9,7 +9,23 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
|
|
|
|
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
|
|
|
+++ b/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))
|
|
if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
|
|
|
ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
|
|
ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
|
|
|
#endif
|
|
#endif
|