package/kernel/mac80211/patches/323-0010-brcmfmac-wrap-brcmf_fws_reset_interface-into-bcdc-la.patch

   1 From 66ded1f8b33cdd9d6d3e20f5f8dd23615a110e70 Mon Sep 17 00:00:00 2001
   2 From: Franky Lin <franky.lin@broadcom.com>
   3 Date: Fri, 10 Mar 2017 21:17:06 +0000
   4 Subject: [PATCH] brcmfmac: wrap brcmf_fws_reset_interface into bcdc layer
   5
   6 Create a new protocol interface function brcmf_proto_reset_if for core
   7 module to notify protocol layer when interface role changes.
   8
   9 Signed-off-by: Franky Lin <franky.lin@broadcom.com>
  10 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
  11 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  12 ---
  13  drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c  | 7 +++++++
  14  drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c  | 3 +--
  15  drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h | 9 +++++++++
  16  3 files changed, 17 insertions(+), 2 deletions(-)
  17
  18 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  19 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  20 @@ -411,6 +411,12 @@ brcmf_proto_bcdc_del_if(struct brcmf_if
  21         brcmf_fws_del_interface(ifp);
  22  }
  23
  24 +static void
  25 +brcmf_proto_bcdc_reset_if(struct brcmf_if *ifp)
  26 +{
  27 +       brcmf_fws_reset_interface(ifp);
  28 +}
  29 +
  30  int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
  31  {
  32         struct brcmf_bcdc *bcdc;
  33 @@ -436,6 +442,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
  34         drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;
  35         drvr->proto->add_if = brcmf_proto_bcdc_add_if;
  36         drvr->proto->del_if = brcmf_proto_bcdc_del_if;
  37 +       drvr->proto->reset_if = brcmf_proto_bcdc_reset_if;
  38         drvr->proto->pd = bcdc;
  39
  40         drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
  41 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
  42 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
  43 @@ -22,7 +22,6 @@
  44  #include "core.h"
  45  #include "debug.h"
  46  #include "tracepoint.h"
  47 -#include "fwsignal.h"
  48  #include "fweh.h"
  49  #include "fwil.h"
  50  #include "proto.h"
  51 @@ -180,7 +179,7 @@ static void brcmf_fweh_handle_if_event(s
  52         }
  53
  54         if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)
  55 -               brcmf_fws_reset_interface(ifp);
  56 +               brcmf_proto_reset_if(drvr, ifp);
  57
  58         err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
  59
  60 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  61 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
  62 @@ -46,6 +46,7 @@ struct brcmf_proto {
  63         void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);
  64         void (*add_if)(struct brcmf_if *ifp);
  65         void (*del_if)(struct brcmf_if *ifp);
  66 +       void (*reset_if)(struct brcmf_if *ifp);
  67         void *pd;
  68  };
  69
  70 @@ -136,4 +137,12 @@ brcmf_proto_del_if(struct brcmf_pub *drv
  71         drvr->proto->del_if(ifp);
  72  }
  73
  74 +static inline void
  75 +brcmf_proto_reset_if(struct brcmf_pub *drvr, struct brcmf_if *ifp)
  76 +{
  77 +       if (!drvr->proto->reset_if)
  78 +               return;
  79 +       drvr->proto->reset_if(ifp);
  80 +}
  81 +
  82  #endif /* BRCMFMAC_PROTO_H */