package/kernel/mac80211/patches/359-0008-brcmfmac-assure-p2pdev-is-unregistered-upon-driver-u.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Thu, 11 Jun 2015 00:12:23 +0200
   3 Subject: [PATCH] brcmfmac: assure p2pdev is unregistered upon driver
   4  unload
   5
   6 When unloading the driver with a p2pdev interface it resulted in
   7 a warning upon calling wiphy_unregister() and subsequently a crash
   8 in the driver. This patch assures the p2pdev is unregistered calling
   9 unregister_wdev() before doing the wiphy_unregister().
  10
  11 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
  12 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
  13 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  14 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  16 ---
  17
  18 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  19 +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  20 @@ -6206,10 +6206,8 @@ void brcmf_cfg80211_detach(struct brcmf_
  21         if (!cfg)
  22                 return;
  23
  24 -       WARN_ON(!list_empty(&cfg->vif_list));
  25 -       wiphy_unregister(cfg->wiphy);
  26         brcmf_btcoex_detach(cfg);
  27 -       brcmf_p2p_detach(&cfg->p2p);
  28 +       wiphy_unregister(cfg->wiphy);
  29         wl_deinit_priv(cfg);
  30         brcmf_free_wiphy(cfg->wiphy);
  31  }
  32 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
  33 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
  34 @@ -1098,6 +1098,7 @@ void brcmf_detach(struct device *dev)
  35
  36         /* stop firmware event handling */
  37         brcmf_fweh_detach(drvr);
  38 +       brcmf_p2p_detach(&drvr->config->p2p);
  39
  40         brcmf_bus_change_state(bus_if, BRCMF_BUS_DOWN);
  41
  42 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  43 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  44 @@ -16,6 +16,7 @@
  45  #include <linux/slab.h>
  46  #include <linux/netdevice.h>
  47  #include <linux/etherdevice.h>
  48 +#include <linux/rtnetlink.h>
  49  #include <net/cfg80211.h>
  50
  51  #include <brcmu_wifi.h>
  52 @@ -2418,8 +2419,9 @@ void brcmf_p2p_detach(struct brcmf_p2p_i
  53                 brcmf_p2p_cancel_remain_on_channel(vif->ifp);
  54                 brcmf_p2p_deinit_discovery(p2p);
  55                 /* remove discovery interface */
  56 -               brcmf_free_vif(vif);
  57 -               p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
  58 +               rtnl_lock();
  59 +               brcmf_p2p_delete_p2pdev(p2p, vif);
  60 +               rtnl_unlock();
  61         }
  62         /* just set it all to zero */
  63         memset(p2p, 0, sizeof(*p2p));