5b91d2b52e
Some of our local patches have been accepted upstream. And there are some more relevant changes (mostly for rt2800usb). Import them and rebase our remaining local patches on top. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
95 lines
3.5 KiB
Diff
95 lines
3.5 KiB
Diff
From a13d985f26f6df07d5c5c0e190477628e236babc Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Wed, 15 Feb 2017 10:25:05 +0100
|
|
Subject: [PATCH 09/19] rt2800: identify station based on status WCID
|
|
|
|
Add framework to identify sta based on tx status WCID. This is currently
|
|
not used, will start be utilized in the future patch.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 5 +++++
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 1 +
|
|
drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 3 ++-
|
|
3 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
index 8223a1520316..46405cce35e0 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -855,11 +855,13 @@ EXPORT_SYMBOL_GPL(rt2800_process_rxwi);
|
|
void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)
|
|
{
|
|
struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
|
|
+ struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
|
|
struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
|
|
struct txdone_entry_desc txdesc;
|
|
u32 word;
|
|
u16 mcs, real_mcs;
|
|
int aggr, ampdu;
|
|
+ int wcid;
|
|
|
|
/*
|
|
* Obtain the status about this packet.
|
|
@@ -872,6 +874,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi)
|
|
|
|
real_mcs = rt2x00_get_field32(status, TX_STA_FIFO_MCS);
|
|
aggr = rt2x00_get_field32(status, TX_STA_FIFO_TX_AGGRE);
|
|
+ wcid = rt2x00_get_field32(status, TX_STA_FIFO_WCID);
|
|
|
|
/*
|
|
* If a frame was meant to be sent as a single non-aggregated MPDU
|
|
@@ -1468,6 +1471,7 @@ int rt2800_sta_add(struct rt2x00_dev *rt2x00dev, struct ieee80211_vif *vif,
|
|
return 0;
|
|
|
|
__set_bit(wcid - WCID_START, drv_data->sta_ids);
|
|
+ drv_data->wcid_to_sta[wcid - WCID_START] = sta;
|
|
|
|
/*
|
|
* Clean up WCID attributes and write STA address to the device.
|
|
@@ -1498,6 +1502,7 @@ int rt2800_sta_remove(struct rt2x00_dev *rt2x00dev, struct ieee80211_sta *sta)
|
|
* get renewed when the WCID is reused.
|
|
*/
|
|
rt2800_config_wcid(rt2x00dev, NULL, wcid);
|
|
+ drv_data->wcid_to_sta[wcid - WCID_START] = NULL;
|
|
__clear_bit(wcid - WCID_START, drv_data->sta_ids);
|
|
|
|
return 0;
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
index 8e1ae138c3f1..6811d677a6e7 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
|
|
@@ -41,6 +41,7 @@ struct rt2800_drv_data {
|
|
unsigned int tbtt_tick;
|
|
unsigned int ampdu_factor_cnt[4];
|
|
DECLARE_BITMAP(sta_ids, STA_IDS_SIZE);
|
|
+ struct ieee80211_sta *wcid_to_sta[STA_IDS_SIZE];
|
|
};
|
|
|
|
struct rt2800_ops {
|
|
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
|
|
index 22d18818e850..9b297fce4692 100644
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
|
|
@@ -102,7 +102,7 @@ enum skb_frame_desc_flags {
|
|
* of the scope of the skb->data pointer.
|
|
* @iv: IV/EIV data used during encryption/decryption.
|
|
* @skb_dma: (PCI-only) the DMA address associated with the sk buffer.
|
|
- * @entry: The entry to which this sk buffer belongs.
|
|
+ * @sta: The station where sk buffer was sent.
|
|
*/
|
|
struct skb_frame_desc {
|
|
u8 flags;
|
|
@@ -116,6 +116,7 @@ struct skb_frame_desc {
|
|
__le32 iv[2];
|
|
|
|
dma_addr_t skb_dma;
|
|
+ struct ieee80211_sta *sta;
|
|
};
|
|
|
|
/**
|
|
--
|
|
2.12.1
|
|
|