mt76: move ampdu_ref from mt76_dev to driver struct

It is only used by the driver

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 4e1aaae..5b648ef 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -502,7 +502,6 @@ struct mt76_dev {
        spinlock_t rx_lock;
        struct napi_struct napi[__MT_RXQ_MAX];
        struct sk_buff_head rx_skb[__MT_RXQ_MAX];
-       u32 ampdu_ref;
 
        struct list_head txwi_cache;
        struct mt76_sw_queue q_tx[2 * __MT_TXQ_MAX];

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index ab9ac6e..2a384fd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -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 */
                if (dev->rx_ampdu_ts != rxd[12]) {
-                       if (!++dev->mt76.ampdu_ref)
-                               dev->mt76.ampdu_ref++;
+                       if (!++dev->ampdu_ref)
+                               dev->ampdu_ref++;
                }
                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;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 63ec1fa..12fd2db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -118,6 +118,7 @@ struct mt7603_dev {
        u32 false_cca_ofdm, false_cca_cck;
        unsigned long last_cca_adj;
 
+       u32 ampdu_ref;
        __le32 rx_ampdu_ts;
        u8 rssi_offset[3];
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 38abb3d..bf9c800 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -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 */
                if (dev->rx_ampdu_ts != rxd[12]) {
-                       if (!++dev->mt76.ampdu_ref)
-                               dev->mt76.ampdu_ref++;
+                       if (!++dev->ampdu_ref)
+                               dev->ampdu_ref++;
                }
                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;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 9c27b35..17ec75a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -90,6 +90,7 @@ struct mt7615_dev {
        u32 omac_mask;
 
        __le32 rx_ampdu_ts;
+       u32 ampdu_ref;
 
        struct list_head sta_poll_list;
        spinlock_t sta_poll_lock;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02.h b/drivers/net/wireless/mediatek/mt76/mt76x02.h
index f00a9a6..ba4c14e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02.h
@@ -86,6 +86,7 @@ struct mt76x02_dev {
        DECLARE_KFIFO_PTR(txstatus_fifo, struct mt76x02_tx_status);
        spinlock_t txstatus_fifo_lock;
        u32 tx_airtime;
+       u32 ampdu_ref;
 
        struct sk_buff *rx_head;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 098792b..5b512e4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -824,7 +824,7 @@ int mt76x02_mac_process_rx(struct mt76x02_dev *dev, struct sk_buff *skb,
 
        if (rxinfo & MT_RXINFO_AMPDU) {
                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,
@@ -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
                 */
                if (rxinfo & MT_RXINFO_RSSI) {
-                       if (!++dev->mt76.ampdu_ref)
-                               dev->mt76.ampdu_ref++;
+                       if (!++dev->ampdu_ref)
+                               dev->ampdu_ref++;
                }
        }