package/kernel/mac80211/patches/brcm/100-brcmfmac-fix-roamoff-1-modparam.patch

   1 From 22d319f2665dd3458d59c934fa0c8cf1b1d7227f Mon Sep 17 00:00:00 2001
   2 From: Stijn Tintel <stijn@linux-ipv6.be>
   3 Date: Sat, 10 Nov 2018 13:25:20 +0200
   4 Subject: [PATCH wireless-drivers] brcmfmac: fix roamoff=1 modparam
   5
   6 When the update_connect_param callback is set, nl80211 expects the flag
   7 WIPHY_FLAG_SUPPORTS_FW_ROAM to be set as well. However, this flag is
   8 only set when modparam roamoff=0, while the callback is set
   9 unconditionally. Since commit 7f9a3e150ec7 this causes a warning in
  10 wiphy_register, which breaks brcmfmac.
  11
  12 Disable the update_connect_param callback when roamoff=0 to fix this.
  13
  14 Fixes: 7f9a3e150ec7 ("nl80211: Update ERP info using NL80211_CMD_UPDATE_CONNECT_PARAMS")
  15 Cc: Stable <stable@vger.kernel.org> # 4.19+
  16 Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
  17 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
  18 ---
  19  .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.c   | 11 +++++++++--
  20  .../wireless/broadcom/brcm80211/brcmfmac/cfg80211.h   |  2 +-
  21  .../net/wireless/broadcom/brcm80211/brcmfmac/core.c   |  2 +-
  22  3 files changed, 11 insertions(+), 4 deletions(-)
  23
  24 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  25 index 7f0a5bade70a..c0e3ae7bf2ae 100644
  26 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  27 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
  28 @@ -5196,10 +5196,17 @@ static struct cfg80211_ops brcmf_cfg80211_ops = {
  29         .del_pmk = brcmf_cfg80211_del_pmk,
  30  };
  31
  32 -struct cfg80211_ops *brcmf_cfg80211_get_ops(void)
  33 +struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings)
  34  {
  35 -       return kmemdup(&brcmf_cfg80211_ops, sizeof(brcmf_cfg80211_ops),
  36 +       struct cfg80211_ops *ops;
  37 +
  38 +       ops = kmemdup(&brcmf_cfg80211_ops, sizeof(brcmf_cfg80211_ops),
  39                        GFP_KERNEL);
  40 +
  41 +       if (ops && settings->roamoff)
  42 +               ops->update_connect_params = NULL;
  43 +
  44 +       return ops;
  45  }
  46
  47  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
  48 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
  49 index a4aec0004e4f..9a6287f084a9 100644
  50 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
  51 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
  52 @@ -404,7 +404,7 @@ struct brcmf_cfg80211_info *brcmf_cfg80211_attach(struct brcmf_pub *drvr,
  53  void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg);
  54  s32 brcmf_cfg80211_up(struct net_device *ndev);
  55  s32 brcmf_cfg80211_down(struct net_device *ndev);
  56 -struct cfg80211_ops *brcmf_cfg80211_get_ops(void);
  57 +struct cfg80211_ops *brcmf_cfg80211_get_ops(struct brcmf_mp_device *settings);
  58  enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
  59
  60  struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
  61 diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  62 index b1f702faff4f..860a4372cb56 100644
  63 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  64 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  65 @@ -1130,7 +1130,7 @@ int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
  66
  67         brcmf_dbg(TRACE, "Enter\n");
  68
  69 -       ops = brcmf_cfg80211_get_ops();
  70 +       ops = brcmf_cfg80211_get_ops(settings);
  71         if (!ops)
  72                 return -ENOMEM;
  73
  74 --
  75 2.18.1
  76