package/kernel/mac80211/patches/319-0032-brcmfmac-use-correct-skb-freeing-helper-when-deletin.patch

   1 From 7f00ee2bbc630900ba16fc2690473f3e2db0e264 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Tue, 27 Sep 2016 14:11:04 +0200
   4 Subject: [PATCH] brcmfmac: use correct skb freeing helper when deleting
   5  flowring
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 Flowrings contain skbs waiting for transmission that were passed to us
  11 by netif. It means we checked every one of them looking for 802.1x
  12 Ethernet type. When deleting flowring we have to use freeing function
  13 that will check for 802.1x type as well.
  14
  15 Freeing skbs without a proper check was leading to counter not being
  16 properly decreased. This was triggering a WARNING every time
  17 brcmf_netdev_wait_pend8021x was called.
  18
  19 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  20 Acked-by: Arend van Spriel <arend@broadcom.com>
  21 Cc: stable@vger.kernel.org # 4.5+
  22 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
  23 ---
  24  drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 9 ++++++++-
  25  1 file changed, 8 insertions(+), 1 deletion(-)
  26
  27 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
  28 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
  29 @@ -234,13 +234,20 @@ static void brcmf_flowring_block(struct
  30
  31  void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid)
  32  {
  33 +       struct brcmf_bus *bus_if = dev_get_drvdata(flow->dev);
  34         struct brcmf_flowring_ring *ring;
  35 +       struct brcmf_if *ifp;
  36         u16 hash_idx;
  37 +       u8 ifidx;
  38         struct sk_buff *skb;
  39
  40         ring = flow->rings[flowid];
  41         if (!ring)
  42                 return;
  43 +
  44 +       ifidx = brcmf_flowring_ifidx_get(flow, flowid);
  45 +       ifp = brcmf_get_ifp(bus_if->drvr, ifidx);
  46 +
  47         brcmf_flowring_block(flow, flowid, false);
  48         hash_idx = ring->hash_id;
  49         flow->hash[hash_idx].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
  50 @@ -249,7 +256,7 @@ void brcmf_flowring_delete(struct brcmf_
  51
  52         skb = skb_dequeue(&ring->skblist);
  53         while (skb) {
  54 -               brcmu_pkt_buf_free_skb(skb);
  55 +               brcmf_txfinalize(ifp, skb, false);
  56                 skb = skb_dequeue(&ring->skblist);
  57         }
  58