mac80211: brcmfmac: backport BCDC layer changes from kernel 4.12

[openwrt/openwrt.git] / package / kernel / mac80211 / patches / 339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch

diff --git a/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch b/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch
index 1694b42aa44f8b5effa57e4bb29ddccc65f22394..0707030c16c0134c61f17f369031d65eae1d3e60 100644 (file)
--- a/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch
+++ b/package/kernel/mac80211/patches/339-v5.1-0008-brcmfmac-rework-bphy_err-to-take-struct-brcmf_pub-ar.patch
@@ -2079,7 +2079,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                wiphy->wowlan = &brcmf_wowlan_support;
                return;
        }
-@@ -6585,7 +6634,7 @@ static int brcmf_setup_wiphy(struct wiph
+@@ -6586,7 +6635,7 @@ static int brcmf_setup_wiphy(struct wiph
        err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_BANDLIST, &bandlist,
                                     sizeof(bandlist));
        if (err) {
@@ -2088,7 +2088,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                return err;
        }
        /* first entry in bandlist is number of bands */
-@@ -6846,6 +6895,7 @@ static void brcmf_cfg80211_reg_notifier(
+@@ -6847,6 +6896,7 @@ static void brcmf_cfg80211_reg_notifier(
  {
        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
        struct brcmf_if *ifp = brcmf_get_ifp(cfg->pub, 0);
@@ -2096,7 +2096,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        struct brcmf_fil_country_le ccreq;
        s32 err;
        int i;
-@@ -6857,7 +6907,7 @@ static void brcmf_cfg80211_reg_notifier(
+@@ -6858,7 +6908,7 @@ static void brcmf_cfg80211_reg_notifier(
        /* ignore non-ISO3166 country codes */
        for (i = 0; i < 2; i++)
                if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
@@ -2105,7 +2105,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                                 req->alpha2[0], req->alpha2[1]);
                        return;
                }
-@@ -6867,7 +6917,7 @@ static void brcmf_cfg80211_reg_notifier(
+@@ -6868,7 +6918,7 @@ static void brcmf_cfg80211_reg_notifier(
  
        err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
        if (err) {
@@ -2114,7 +2114,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                return;
        }
  
-@@ -6877,7 +6927,7 @@ static void brcmf_cfg80211_reg_notifier(
+@@ -6878,7 +6928,7 @@ static void brcmf_cfg80211_reg_notifier(
  
        err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
        if (err) {
@@ -2123,7 +2123,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                return;
        }
        brcmf_setup_wiphybands(cfg);
-@@ -6923,13 +6973,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6924,13 +6974,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
        u16 *cap = NULL;
  
        if (!ndev) {
@@ -2139,7 +2139,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                return NULL;
        }
  
-@@ -6950,7 +7000,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6951,7 +7001,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  
        err = wl_init_priv(cfg);
        if (err) {
@@ -2148,7 +2148,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                brcmf_free_vif(vif);
                goto wiphy_out;
        }
-@@ -6959,7 +7009,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6960,7 +7010,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
        /* determine d11 io type before wiphy setup */
        err = brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_VERSION, &io_type);
        if (err) {
@@ -2157,7 +2157,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                goto priv_out;
        }
        cfg->d11inf.io_type = (u8)io_type;
-@@ -6993,13 +7043,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6994,13 +7044,13 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  #endif
        err = wiphy_register(wiphy);
        if (err < 0) {
@@ -2173,7 +2173,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                goto wiphy_unreg_out;
        }
  
-@@ -7017,18 +7067,18 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -7018,18 +7068,18 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  
        err = brcmf_fweh_activate_events(ifp);
        if (err) {
@@ -2195,7 +2195,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                brcmf_p2p_detach(&cfg->p2p);
                goto wiphy_unreg_out;
        }
-@@ -7047,7 +7097,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -7048,7 +7098,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
        /* (re-) activate FWEH event handling */
        err = brcmf_fweh_activate_events(ifp);
        if (err) {