package/kernel/mac80211/patches/321-brcmfmac-change-parameters-for-brcmf_remove_interfac.patch

   1 From: Arend van Spriel <arend@broadcom.com>
   2 Date: Wed, 26 Aug 2015 22:14:55 +0200
   3 Subject: [PATCH] brcmfmac: change parameters for
   4  brcmf_remove_interface()
   5
   6 Just pass the interface to be removed, ie. the struct brcmf_if instance.
   7
   8 Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
   9 Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
  10 Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
  11 Signed-off-by: Arend van Spriel <arend@broadcom.com>
  12 ---
  13
  14 --- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  15 +++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
  16 @@ -4983,7 +4983,7 @@ brcmf_notify_connect_status_ap(struct br
  17                 brcmf_dbg(CONN, "AP mode link down\n");
  18                 complete(&cfg->vif_disabled);
  19                 if (ifp->vif->mbss)
  20 -                       brcmf_remove_interface(ifp->drvr, ifp->bssidx);
  21 +                       brcmf_remove_interface(ifp);
  22                 return 0;
  23         }
  24
  25 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
  26 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
  27 @@ -887,12 +887,13 @@ static void brcmf_del_if(struct brcmf_pu
  28         }
  29  }
  30
  31 -void brcmf_remove_interface(struct brcmf_pub *drvr, u32 bssidx)
  32 +void brcmf_remove_interface(struct brcmf_if *ifp)
  33  {
  34 -       if (drvr->iflist[bssidx]) {
  35 -               brcmf_fws_del_interface(drvr->iflist[bssidx]);
  36 -               brcmf_del_if(drvr, bssidx);
  37 -       }
  38 +       if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bssidx] != ifp))
  39 +               return;
  40 +
  41 +       brcmf_fws_del_interface(ifp);
  42 +       brcmf_del_if(ifp->drvr, ifp->bssidx);
  43  }
  44
  45  int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)
  46 @@ -1122,7 +1123,7 @@ void brcmf_detach(struct device *dev)
  47
  48         /* make sure primary interface removed last */
  49         for (i = BRCMF_MAX_IFS-1; i > -1; i--)
  50 -               brcmf_remove_interface(drvr, i);
  51 +               brcmf_remove_interface(drvr->iflist[i]);
  52
  53         brcmf_cfg80211_detach(drvr->config);
  54
  55 --- a/drivers/net/wireless/brcm80211/brcmfmac/core.h
  56 +++ b/drivers/net/wireless/brcm80211/brcmfmac/core.h
  57 @@ -206,7 +206,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
  58  int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
  59  struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bssidx, s32 ifidx,
  60                               char *name, u8 *mac_addr);
  61 -void brcmf_remove_interface(struct brcmf_pub *drvr, u32 bssidx);
  62 +void brcmf_remove_interface(struct brcmf_if *ifp);
  63  int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr);
  64  void brcmf_txflowblock_if(struct brcmf_if *ifp,
  65                           enum brcmf_netif_stop_reason reason, bool state);
  66 --- a/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
  67 +++ b/drivers/net/wireless/brcm80211/brcmfmac/fweh.c
  68 @@ -222,7 +222,7 @@ static void brcmf_fweh_handle_if_event(s
  69         err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
  70
  71         if (ifp && ifevent->action == BRCMF_E_IF_DEL)
  72 -               brcmf_remove_interface(drvr, ifevent->bssidx);
  73 +               brcmf_remove_interface(ifp);
  74  }
  75
  76  /**
  77 --- a/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  78 +++ b/drivers/net/wireless/brcm80211/brcmfmac/p2p.c
  79 @@ -2140,7 +2140,7 @@ static void brcmf_p2p_delete_p2pdev(stru
  80  {
  81         cfg80211_unregister_wdev(&vif->wdev);
  82         p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
  83 -       brcmf_remove_interface(vif->ifp->drvr, vif->ifp->bssidx);
  84 +       brcmf_remove_interface(vif->ifp);
  85         brcmf_free_vif(vif);
  86  }
  87