package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch

   1 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
   2 Date: Mon, 6 Jun 2016 23:03:55 +0200
   3 Subject: [PATCH] brcmfmac: drop unused pm_block vif attribute
   4 MIME-Version: 1.0
   5 Content-Type: text/plain; charset=UTF-8
   6 Content-Transfer-Encoding: 8bit
   7
   8 This attribute was added 3 years ago by
   9 commit 3eacf866559c ("brcmfmac: introduce brcmf_cfg80211_vif structure")
  10 but it remains unused since then. It seems we can safely drop it.
  11
  12 Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  13 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  14 ---
  15
  16 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  17 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  18 @@ -587,7 +587,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
  19
  20         brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);
  21
  22 -       vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP, false);
  23 +       vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP);
  24         if (IS_ERR(vif))
  25                 return (struct wireless_dev *)vif;
  26
  27 @@ -5114,8 +5114,7 @@ static struct cfg80211_ops brcmf_cfg8021
  28  };
  29
  30  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
  31 -                                          enum nl80211_iftype type,
  32 -                                          bool pm_block)
  33 +                                          enum nl80211_iftype type)
  34  {
  35         struct brcmf_cfg80211_vif *vif_walk;
  36         struct brcmf_cfg80211_vif *vif;
  37 @@ -5130,8 +5129,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
  38         vif->wdev.wiphy = cfg->wiphy;
  39         vif->wdev.iftype = type;
  40
  41 -       vif->pm_block = pm_block;
  42 -
  43         brcmf_init_prof(&vif->profile);
  44
  45         if (type == NL80211_IFTYPE_AP) {
  46 @@ -6769,7 +6766,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
  47         init_vif_event(&cfg->vif_event);
  48         INIT_LIST_HEAD(&cfg->vif_list);
  49
  50 -       vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION, false);
  51 +       vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION);
  52         if (IS_ERR(vif))
  53                 goto wiphy_out;
  54
  55 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
  56 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
  57 @@ -167,7 +167,6 @@ struct vif_saved_ie {
  58   * @wdev: wireless device.
  59   * @profile: profile information.
  60   * @sme_state: SME state using enum brcmf_vif_status bits.
  61 - * @pm_block: power-management blocked.
  62   * @list: linked list.
  63   * @mgmt_rx_reg: registered rx mgmt frame types.
  64   * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P).
  65 @@ -177,7 +176,6 @@ struct brcmf_cfg80211_vif {
  66         struct wireless_dev wdev;
  67         struct brcmf_cfg80211_profile profile;
  68         unsigned long sme_state;
  69 -       bool pm_block;
  70         struct vif_saved_ie saved_ie;
  71         struct list_head list;
  72         u16 mgmt_rx_reg;
  73 @@ -388,8 +386,7 @@ s32 brcmf_cfg80211_down(struct net_devic
  74  enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
  75
  76  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
  77 -                                          enum nl80211_iftype type,
  78 -                                          bool pm_block);
  79 +                                          enum nl80211_iftype type);
  80  void brcmf_free_vif(struct brcmf_cfg80211_vif *vif);
  81
  82  s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
  83 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  84 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
  85 @@ -2074,8 +2074,7 @@ static struct wireless_dev *brcmf_p2p_cr
  86         if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
  87                 return ERR_PTR(-ENOSPC);
  88
  89 -       p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE,
  90 -                                 false);
  91 +       p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
  92         if (IS_ERR(p2p_vif)) {
  93                 brcmf_err("could not create discovery vif\n");
  94                 return (struct wireless_dev *)p2p_vif;
  95 @@ -2175,7 +2174,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
  96                 return ERR_PTR(-EOPNOTSUPP);
  97         }
  98
  99 -       vif = brcmf_alloc_vif(cfg, type, false);
 100 +       vif = brcmf_alloc_vif(cfg, type);
 101         if (IS_ERR(vif))
 102                 return (struct wireless_dev *)vif;
 103         brcmf_cfg80211_arm_vif_event(cfg, vif);