package/kernel/mac80211/patches/020-09-rt2800-identify-station-based-on-status-WCID.patch

   1 From a13d985f26f6df07d5c5c0e190477628e236babc Mon Sep 17 00:00:00 2001
   2 From: Stanislaw Gruszka <sgruszka@redhat.com>
   3 Date: Wed, 15 Feb 2017 10:25:05 +0100
   4 Subject: [PATCH 09/19] rt2800: identify station based on status WCID
   5
   6 Add framework to identify sta based on tx status WCID. This is currently
   7 not used, will start be utilized in the future patch.
   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/rt2800lib.c   | 5 +++++
  13  drivers/net/wireless/ralink/rt2x00/rt2800lib.h   | 1 +
  14  drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 3 ++-
  15  3 files changed, 8 insertions(+), 1 deletion(-)
  16
  17 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  18 index 8223a1520316..46405cce35e0 100644
  19 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  20 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
  21 @@ -855,11 +855,13 @@ EXPORT_SYMBOL_GPL(rt2800_process_rxwi);
  22  void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)
  23  {
  24         struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
  25 +       struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
  26         struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
  27         struct txdone_entry_desc txdesc;
  28         u32 word;
  29         u16 mcs, real_mcs;
  30         int aggr, ampdu;
  31 +       int wcid;
  32
  33         /*
  34          * Obtain the status about this packet.
  35 @@ -872,6 +874,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)
  36
  37         real_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS);
  38         aggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE);
  39 +       wcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID);
  40
  41         /*
  42          * If a frame was meant to be sent as a single non-aggregated MPDU
  43 @@ -1468,6 +1471,7 @@ int rt2800_sta_add(struct rt2x00_dev *rt2x00dev, struct ieee80211_vif *vif,
  44                 return 0;
  45
  46         __set_bit(wcid - WCID_START, drv_data->sta_ids);
  47 +       drv_data->wcid_to_sta[wcid - WCID_START] = sta;
  48
  49         /*
  50          * Clean up WCID attributes and write STA address to the device.
  51 @@ -1498,6 +1502,7 @@ int rt2800_sta_remove(struct rt2x00_dev *rt2x00dev, struct ieee80211_sta *sta)
  52          * get renewed when the WCID is reused.
  53          */
  54         rt2800_config_wcid(rt2x00dev, NULL, wcid);
  55 +       drv_data->wcid_to_sta[wcid - WCID_START] = NULL;
  56         __clear_bit(wcid - WCID_START, drv_data->sta_ids);
  57
  58         return 0;
  59 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  60 index 8e1ae138c3f1..6811d677a6e7 100644
  61 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  62 +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
  63 @@ -41,6 +41,7 @@ struct rt2800_drv_data {
  64         unsigned int tbtt_tick;
  65         unsigned int ampdu_factor_cnt[4];
  66         DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
  67 +       struct ieee80211_sta *wcid_to_sta[STA_IDS_SIZE];
  68  };
  69
  70  struct rt2800_ops {
  71 diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  72 index 22d18818e850..9b297fce4692 100644
  73 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  74 +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
  75 @@ -102,7 +102,7 @@ enum skb_frame_desc_flags {
  76   *     of the scope of the skb->data pointer.
  77   * @iv: IV/EIV data used during encryption/decryption.
  78   * @skb_dma: (PCI-only) the DMA address associated with the sk buffer.
  79 - * @entry: The entry to which this sk buffer belongs.
  80 + * @sta: The station where sk buffer was sent.
  81   */
  82  struct skb_frame_desc {
  83         u8 flags;
  84 @@ -116,6 +116,7 @@ struct skb_frame_desc {
  85         __le32 iv[2];
  86
  87         dma_addr_t skb_dma;
  88 +       struct ieee80211_sta *sta;
  89  };
  90
  91  /**
  92 --
  93 2.12.1
  94