Commit 30684481 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: move ampdu_ref from mt76_dev to driver struct 



It is only used by the driver

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent c7d2d631

drivers/net/wireless/mediatek/mt76/mt76.h

+0 −1
Original line number Diff line number Diff line
@@ -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];

drivers/net/wireless/mediatek/mt76/mt7603/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

+1 −0
Original line number Diff line number Diff line
@@ -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];

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h

+1 −0
Original line number Diff line number Diff line
@@ -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;