gitops/mt76
1
0
Fork 0
mirror of https://github.com/outbackdingo/mt76.git synced 2026-10-24 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

mt76: move ampdu_ref from mt76_dev to driver struct

Browse Source 
It is only used by the driver

Signed-off-by: Felix Fietkau <[email protected]>
This commit is contained in:
Felix Fietkau
2019-12-03 20:04:12 +01:00
parent 04cd17a645
commit 1c8d69e7d6
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mt76.h
-1
View File
@@ -502,7 +502,6 @@ struct mt76_dev {
spinlock_t rx_lock; spinlock_t rx_lock;
struct napi_struct napi[__MT_RXQ_MAX]; struct napi_struct napi[__MT_RXQ_MAX];
struct sk_buff_head rx_skb[__MT_RXQ_MAX]; struct sk_buff_head rx_skb[__MT_RXQ_MAX];
u32 ampdu_ref;
struct list_head txwi_cache; struct list_head txwi_cache;
struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX]; struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX];
mt7603/mac.c
+3 -3
View File
@@ -531,12 +531,12 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb)
/* all subframes of an A-MPDU have the same timestamp */ /* all subframes of an A-MPDU have the same timestamp */
if (dev->rx_ampdu_ts != rxd[12]) { if (dev->rx_ampdu_ts != rxd[12]) {
if (!++dev->mt76.ampdu_ref) if (!++dev->ampdu_ref)
dev->mt76.ampdu_ref++; dev->ampdu_ref++;
} }
dev->rx_ampdu_ts = rxd[12]; dev->rx_ampdu_ts = rxd[12];
status->ampdu_ref = dev->mt76.ampdu_ref; status->ampdu_ref = dev->ampdu_ref;
} }
remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET; remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET;
mt7603/mt7603.h
+1
View File
@@ -118,6 +118,7 @@ struct mt7603_dev {
u32 false_cca_ofdm, false_cca_cck; u32 false_cca_ofdm, false_cca_cck;
unsigned long last_cca_adj; unsigned long last_cca_adj;
u32 ampdu_ref;
__le32 rx_ampdu_ts; __le32 rx_ampdu_ts;
u8 rssi_offset[3]; u8 rssi_offset[3];
mt7615/mac.c
+3 -3
View File
@@ -118,12 +118,12 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb)
/* all subframes of an A-MPDU have the same timestamp */ /* all subframes of an A-MPDU have the same timestamp */
if (dev->rx_ampdu_ts != rxd[12]) { if (dev->rx_ampdu_ts != rxd[12]) {
if (!++dev->mt76.ampdu_ref) if (!++dev->ampdu_ref)
dev->mt76.ampdu_ref++; dev->ampdu_ref++;
} }
dev->rx_ampdu_ts = rxd[12]; dev->rx_ampdu_ts = rxd[12];
status->ampdu_ref = dev->mt76.ampdu_ref; status->ampdu_ref = dev->ampdu_ref;
} }
remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET; remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET;
mt7615/mt7615.h
+1
View File
@@ -90,6 +90,7 @@ struct mt7615_dev {
u32 omac_mask; u32 omac_mask;
__le32 rx_ampdu_ts; __le32 rx_ampdu_ts;
u32 ampdu_ref;
struct list_head sta_poll_list; struct list_head sta_poll_list;
spinlock_t sta_poll_lock; spinlock_t sta_poll_lock;
mt76x02.h
+1
View File
@@ -86,6 +86,7 @@ struct mt76x02_dev {
DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status); DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);
spinlock_t txstatus_fifo_lock; spinlock_t txstatus_fifo_lock;
u32 tx_airtime; u32 tx_airtime;
u32 ampdu_ref;
struct sk_buff *rx_head; struct sk_buff *rx_head;
mt76x02_mac.c
+3 -3
View File
@@ -824,7 +824,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
if (rxinfo & MT_RXINFO_AMPDU) { if (rxinfo & MT_RXINFO_AMPDU) {
status->flag |= RX_FLAG_AMPDU_DETAILS; status->flag |= RX_FLAG_AMPDU_DETAILS;
status->ampdu_ref = dev->mt76.ampdu_ref; status->ampdu_ref = dev->ampdu_ref;
/* /*
* When receiving an A-MPDU subframe and RSSI info is not valid, * When receiving an A-MPDU subframe and RSSI info is not valid,
@@ -832,8 +832,8 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
* are coming. The last one will have valid RSSI info * are coming. The last one will have valid RSSI info
*/ */
if (rxinfo & MT_RXINFO_RSSI) { if (rxinfo & MT_RXINFO_RSSI) {
if (!++dev->mt76.ampdu_ref) if (!++dev->ampdu_ref)
dev->mt76.ampdu_ref++; dev->ampdu_ref++;
} }
} }