package/kernel/mac80211/patches/323-0007-brcmfmac-move-brcmf_txcomplete-to-bcdc-layer.patch

   1 From 7b584396b7a760bc77bbde4625f83ef173159d3e Mon Sep 17 00:00:00 2001
   2 From: Franky Lin <franky.lin@broadcom.com>
   3 Date: Fri, 10 Mar 2017 21:17:03 +0000
   4 Subject: [PATCH] brcmfmac: move brcmf_txcomplete to bcdc layer
   5
   6 brcmf_txcomplete is invoked by sdio and usb bus module which are using
   7 bcdc protocol. So move it from core module into bcdc layer.
   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  .../net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c  | 20 ++++++++++++++++++++
  14  .../net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h  |  2 ++
  15  .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h   |  3 ---
  16  .../net/wireless/broadcom/brcm80211/brcmfmac/core.c  | 18 ------------------
  17  .../net/wireless/broadcom/brcm80211/brcmfmac/sdio.c  |  3 ++-
  18  .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c   |  2 +-
  19  6 files changed, 25 insertions(+), 23 deletions(-)
  20
  21 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  22 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
  23 @@ -355,6 +355,26 @@ void brcmf_proto_bcdc_txflowblock(struct
  24         brcmf_fws_bus_blocked(drvr, state);
  25  }
  26
  27 +void
  28 +brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,
  29 +                           bool success)
  30 +{
  31 +       struct brcmf_bus *bus_if = dev_get_drvdata(dev);
  32 +       struct brcmf_pub *drvr = bus_if->drvr;
  33 +       struct brcmf_if *ifp;
  34 +
  35 +       /* await txstatus signal for firmware if active */
  36 +       if (brcmf_fws_fc_active(drvr->fws)) {
  37 +               if (!success)
  38 +                       brcmf_fws_bustxfail(drvr->fws, txp);
  39 +       } else {
  40 +               if (brcmf_proto_bcdc_hdrpull(drvr, false, txp, &ifp))
  41 +                       brcmu_pkt_buf_free_skb(txp);
  42 +               else
  43 +                       brcmf_txfinalize(ifp, txp, success);
  44 +       }
  45 +}
  46 +
  47  static void
  48  brcmf_proto_bcdc_configure_addr_mode(struct brcmf_pub *drvr, int ifidx,
  49                                      enum proto_addr_mode addr_mode)
  50 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h
  51 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.h
  52 @@ -20,6 +20,8 @@
  53  int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr);
  54  void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr);
  55  void brcmf_proto_bcdc_txflowblock(struct device *dev, bool state);
  56 +void brcmf_proto_bcdc_txcomplete(struct device *dev, struct sk_buff *txp,
  57 +                                bool success);
  58  #else
  59  static inline int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr) { return 0; }
  60  static inline void brcmf_proto_bcdc_detach(struct brcmf_pub *drvr) {}
  61 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
  62 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
  63 @@ -230,9 +230,6 @@ void brcmf_detach(struct device *dev);
  64  /* Indication from bus module that dongle should be reset */
  65  void brcmf_dev_reset(struct device *dev);
  66
  67 -/* Notify the bus has transferred the tx packet to firmware */
  68 -void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);
  69 -
  70  /* Configure the "global" bus state used by upper layers */
  71  void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);
  72
  73 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  74 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
  75 @@ -383,24 +383,6 @@ void brcmf_txfinalize(struct brcmf_if *i
  76         brcmu_pkt_buf_free_skb(txp);
  77  }
  78
  79 -void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success)
  80 -{
  81 -       struct brcmf_bus *bus_if = dev_get_drvdata(dev);
  82 -       struct brcmf_pub *drvr = bus_if->drvr;
  83 -       struct brcmf_if *ifp;
  84 -
  85 -       /* await txstatus signal for firmware if active */
  86 -       if (brcmf_fws_fc_active(drvr->fws)) {
  87 -               if (!success)
  88 -                       brcmf_fws_bustxfail(drvr->fws, txp);
  89 -       } else {
  90 -               if (brcmf_proto_hdrpull(drvr, false, txp, &ifp))
  91 -                       brcmu_pkt_buf_free_skb(txp);
  92 -               else
  93 -                       brcmf_txfinalize(ifp, txp, success);
  94 -       }
  95 -}
  96 -
  97  static void brcmf_ethtool_get_drvinfo(struct net_device *ndev,
  98                                     struct ethtool_drvinfo *info)
  99  {
 100 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 101 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
 102 @@ -2266,7 +2266,8 @@ done:
 103                 bus->tx_seq = (bus->tx_seq + pktq->qlen) % SDPCM_SEQ_WRAP;
 104         skb_queue_walk_safe(pktq, pkt_next, tmp) {
 105                 __skb_unlink(pkt_next, pktq);
 106 -               brcmf_txcomplete(bus->sdiodev->dev, pkt_next, ret == 0);
 107 +               brcmf_proto_bcdc_txcomplete(bus->sdiodev->dev, pkt_next,
 108 +                                           ret == 0);
 109         }
 110         return ret;
 111  }
 112 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
 113 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
 114 @@ -483,7 +483,7 @@ static void brcmf_usb_tx_complete(struct
 115                   req->skb);
 116         brcmf_usb_del_fromq(devinfo, req);
 117
 118 -       brcmf_txcomplete(devinfo->dev, req->skb, urb->status == 0);
 119 +       brcmf_proto_bcdc_txcomplete(devinfo->dev, req->skb, urb->status == 0);
 120         req->skb = NULL;
 121         brcmf_usb_enq(devinfo, &devinfo->tx_freeq, req, &devinfo->tx_freecount);
 122         spin_lock_irqsave(&devinfo->tx_flowblock_lock, flags);