package/kernel/mac80211/patches/323-0008-brcmfmac-wrap-brcmf_fws_add_interface-into-bcdc-laye.patch

   1 From 9fdc64bbdbe7bd546e0fbcedd2f1c03448c6df42 Mon Sep 17 00:00:00 2001
   2 From: Franky Lin <franky.lin@broadcom.com>
   3 Date: Fri, 10 Mar 2017 21:17:04 +0000
   4 Subject: [PATCH] brcmfmac: wrap brcmf_fws_add_interface into bcdc layer
   5
   6 fwsignal is only used by bcdc. Create a new protocol interface function
   7 brcmf_proto_add_if for core module to notify protocol layer upon a new
   8 interface is created.
   9
  10 Signed-off-by: Franky Lin <franky.lin@broadcom.com>
  11 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  13 ---
  14  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c  | 7 +++++++
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c  | 2 +-
  16  drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c  | 3 ++-
  17  drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++
  18  4 files changed, 19 insertions(+), 2 deletions(-)
  19
  20 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  21 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  22 @@ -399,6 +399,12 @@ static void brcmf_proto_bcdc_rxreorder(s
  23         brcmf_fws_rxreorder(ifp, skb);
  24  }
  25
  26 +static void
  27 +brcmf_proto_bcdc_add_if(struct brcmf_if *ifp)
  28 +{
  29 +       brcmf_fws_add_interface(ifp);
  30 +}
  31 +
  32  int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
  33  {
  34         struct brcmf_bcdc *bcdc;
  35 @@ -422,6 +428,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
  36         drvr->proto->delete_peer = brcmf_proto_bcdc_delete_peer;
  37         drvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;
  38         drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;
  39 +       drvr->proto->add_if = brcmf_proto_bcdc_add_if;
  40         drvr->proto->pd = bcdc;
  41
  42         drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
  43 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  44 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  45 @@ -990,7 +990,7 @@ int brcmf_bus_started(struct device *dev
  46         if (ret < 0)
  47                 goto fail;
  48
  49 -       brcmf_fws_add_interface(ifp);
  50 +       brcmf_proto_add_if(drvr, ifp);
  51
  52         drvr->config = brcmf_cfg80211_attach(drvr, bus_if->dev,
  53                                              drvr->settings->p2p_enable);
  54 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
  55 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
  56 @@ -25,6 +25,7 @@
  57  #include "fwsignal.h"
  58  #include "fweh.h"
  59  #include "fwil.h"
  60 +#include "proto.h"
  61
  62  /**
  63   * struct brcmf_fweh_queue_item - event item on event queue.
  64 @@ -172,7 +173,7 @@ static void brcmf_fweh_handle_if_event(s
  65                 if (IS_ERR(ifp))
  66                         return;
  67                 if (!is_p2pdev)
  68 -                       brcmf_fws_add_interface(ifp);
  69 +                       brcmf_proto_add_if(drvr, ifp);
  70                 if (!drvr->fweh.evt_handler[BRCMF_E_IF])
  71                         if (brcmf_net_attach(ifp, false) < 0)
  72                                 return;
  73 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  74 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  75 @@ -44,6 +44,7 @@ struct brcmf_proto {
  76         void (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx,
  77                               u8 peer[ETH_ALEN]);
  78         void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);
  79 +       void (*add_if)(struct brcmf_if *ifp);
  80         void *pd;
  81  };
  82
  83 @@ -118,4 +119,12 @@ brcmf_proto_rxreorder(struct brcmf_if *i
  84         ifp->drvr->proto->rxreorder(ifp, skb);
  85  }
  86
  87 +static inline void
  88 +brcmf_proto_add_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)
  89 +{
  90 +       if (!drvr->proto->add_if)
  91 +               return;
  92 +       drvr->proto->add_if(ifp);
  93 +}
  94 +
  95  #endif /* BRCMFMAC_PROTO_H */