mac80211: brcmfmac: backport patches that were skipped previously #1

[openwrt/svn-archive/archive.git] / package / kernel / mac80211 / patches / 351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch

diff --git a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch b/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
index cb6572b6996e2bc33e1c0ad2aa810c35f3b0f67b..f5bacd22db37401047e4b16e1ad57831f58a5f05 100644 (file)
--- a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
+++ b/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
@@ -15,7 +15,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -566,7 +566,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
+@@ -587,7 +587,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
  
        brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);
  
@@ -24,7 +24,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        if (IS_ERR(vif))
                return (struct wireless_dev *)vif;
  
-@@ -4995,8 +4995,7 @@ static struct cfg80211_ops wl_cfg80211_o
+@@ -5097,8 +5097,7 @@ static struct cfg80211_ops brcmf_cfg8021
  };
  
  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
@@ -34,7 +34,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  {
        struct brcmf_cfg80211_vif *vif_walk;
        struct brcmf_cfg80211_vif *vif;
-@@ -5011,8 +5010,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
+@@ -5113,8 +5112,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
        vif->wdev.wiphy = cfg->wiphy;
        vif->wdev.iftype = type;
  
@@ -43,7 +43,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        brcmf_init_prof(&vif->profile);
  
        if (type == NL80211_IFTYPE_AP) {
-@@ -6582,7 +6579,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
+@@ -6753,7 +6750,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
        init_vif_event(&cfg->vif_event);
        INIT_LIST_HEAD(&cfg->vif_list);
  
@@ -54,7 +54,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
-@@ -165,7 +165,6 @@ struct vif_saved_ie {
+@@ -167,7 +167,6 @@ struct vif_saved_ie {
   * @wdev: wireless device.
   * @profile: profile information.
   * @sme_state: SME state using enum brcmf_vif_status bits.
@@ -62,7 +62,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
   * @list: linked list.
   * @mgmt_rx_reg: registered rx mgmt frame types.
   * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P).
-@@ -175,7 +174,6 @@ struct brcmf_cfg80211_vif {
+@@ -177,7 +176,6 @@ struct brcmf_cfg80211_vif {
        struct wireless_dev wdev;
        struct brcmf_cfg80211_profile profile;
        unsigned long sme_state;
@@ -70,7 +70,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        struct vif_saved_ie saved_ie;
        struct list_head list;
        u16 mgmt_rx_reg;
-@@ -386,8 +384,7 @@ s32 brcmf_cfg80211_down(struct net_devic
+@@ -388,8 +386,7 @@ s32 brcmf_cfg80211_down(struct net_devic
  enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
  
  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
@@ -82,7 +82,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-@@ -2064,8 +2064,7 @@ static struct wireless_dev *brcmf_p2p_cr
+@@ -2074,8 +2074,7 @@ static struct wireless_dev *brcmf_p2p_cr
        if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
                return ERR_PTR(-ENOSPC);
  
@@ -92,7 +92,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        if (IS_ERR(p2p_vif)) {
                brcmf_err("could not create discovery vif\n");
                return (struct wireless_dev *)p2p_vif;
-@@ -2165,7 +2164,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
+@@ -2175,7 +2174,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
                return ERR_PTR(-EOPNOTSUPP);
        }