Bump version to v1.5 and start work on adding 4.19 kernel suppot
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 020-12-rt2x00-add-txdone-nomatch-function.patch
1 From a09305d052166cb489402a63a5d275e954e0b923 Mon Sep 17 00:00:00 2001
2 From: Stanislaw Gruszka <sgruszka@redhat.com>
3 Date: Wed, 15 Feb 2017 10:25:08 +0100
4 Subject: [PATCH 12/19] rt2x00: add txdone nomatch function
5
6 This txdone nomatch function will be used when we get status from the HW,
7 but we could not match it with any sent skb.
8
9 Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
10 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
11 ---
12  drivers/net/wireless/ralink/rt2x00/rt2x00.h    |  2 ++
13  drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 50 ++++++++++++++++++++++++++
14  2 files changed, 52 insertions(+)
15
16 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
17 index 340787894c69..91ba10fdf732 100644
18 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
19 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
20 @@ -1425,6 +1425,8 @@ void rt2x00lib_dmastart(struct queue_entry *entry);
21  void rt2x00lib_dmadone(struct queue_entry *entry);
22  void rt2x00lib_txdone(struct queue_entry *entry,
23                       struct txdone_entry_desc *txdesc);
24 +void rt2x00lib_txdone_nomatch(struct queue_entry *entry,
25 +                             struct txdone_entry_desc *txdesc);
26  void rt2x00lib_txdone_noinfo(struct queue_entry *entry, u32 status);
27  void rt2x00lib_rxdone(struct queue_entry *entry, gfp_t gfp);
28  
29 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
30 index 03b368ac9cb6..90fc259fb5bc 100644
31 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
32 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
33 @@ -417,6 +417,56 @@ static void rt2x00lib_clear_entry(struct rt2x00_dev *rt2x00dev,
34         spin_unlock_bh(&entry->queue->tx_lock);
35  }
36  
37 +void rt2x00lib_txdone_nomatch(struct queue_entry *entry,
38 +                             struct txdone_entry_desc *txdesc)
39 +{
40 +       struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
41 +       struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
42 +       struct ieee80211_tx_info txinfo = {};
43 +       bool success;
44 +
45 +       /*
46 +        * Unmap the skb.
47 +        */
48 +       rt2x00queue_unmap_skb(entry);
49 +
50 +       /*
51 +        * Signal that the TX descriptor is no longer in the skb.
52 +        */
53 +       skbdesc->flags &= ~SKBDESC_DESC_IN_SKB;
54 +
55 +       /*
56 +        * Send frame to debugfs immediately, after this call is completed
57 +        * we are going to overwrite the skb->cb array.
58 +        */
59 +       rt2x00debug_dump_frame(rt2x00dev, DUMP_FRAME_TXDONE, entry);
60 +
61 +       /*
62 +        * Determine if the frame has been successfully transmitted and
63 +        * remove BARs from our check list while checking for their
64 +        * TX status.
65 +        */
66 +       success =
67 +           rt2x00lib_txdone_bar_status(entry) ||
68 +           test_bit(TXDONE_SUCCESS, &txdesc->flags);
69 +
70 +       if (!test_bit(TXDONE_UNKNOWN, &txdesc->flags)) {
71 +               /*
72 +                * Update TX statistics.
73 +                */
74 +               rt2x00dev->link.qual.tx_success += success;
75 +               rt2x00dev->link.qual.tx_failed += !success;
76 +
77 +               rt2x00lib_fill_tx_status(rt2x00dev, &txinfo, skbdesc, txdesc,
78 +                                        success);
79 +               ieee80211_tx_status_noskb(rt2x00dev->hw, skbdesc->sta, &txinfo);
80 +       }
81 +
82 +       dev_kfree_skb_any(entry->skb);
83 +       rt2x00lib_clear_entry(rt2x00dev, entry);
84 +}
85 +EXPORT_SYMBOL_GPL(rt2x00lib_txdone_nomatch);
86 +
87  void rt2x00lib_txdone(struct queue_entry *entry,
88                       struct txdone_entry_desc *txdesc)
89  {
90 -- 
91 2.12.1
92