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

mt76: report rx a-mpdu subframe status 



This can be used in monitor mode to figure out which subframes were sent as
part of which A-MPDU

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

drivers/net/wireless/mediatek/mt76/mac80211.c

+1 −0
Original line number Diff line number Diff line
@@ -502,6 +502,7 @@ static struct ieee80211_sta *mt76_rx_convert(struct sk_buff *skb) 
	status->band = mstat.band;

	status->signal = mstat.signal;

	status->chains = mstat.chains;

	status->ampdu_reference = mstat.ampdu_ref;



	BUILD_BUG_ON(sizeof(mstat) > sizeof(skb->cb));

	BUILD_BUG_ON(sizeof(status->chain_signal) !=

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

+3 −0
Original line number Diff line number Diff line
@@ -438,6 +438,7 @@ 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[__MT_TXQ_MAX];
@@ -514,6 +515,8 @@ struct mt76_rx_status { 


	unsigned long reorder_time;



	u32 ampdu_ref;



	u8 iv[6];



	u8 aggr:1;

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

+14 −0
Original line number Diff line number Diff line
@@ -445,6 +445,20 @@ mt7603_mac_fill_rx(struct mt7603_dev *dev, struct sk_buff *skb) 
		status->flag |= RX_FLAG_MMIC_STRIPPED | RX_FLAG_MIC_STRIPPED;

	}



	if (!(rxd2 & (MT_RXD2_NORMAL_NON_AMPDU_SUB |

		      MT_RXD2_NORMAL_NON_AMPDU))) {

		status->flag |= RX_FLAG_AMPDU_DETAILS;



		/* 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++;

		}

		dev->rx_ampdu_ts = rxd[12];



		status->ampdu_ref = dev->mt76.ampdu_ref;

	}



	remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET;



	if (rxd2 & MT_RXD2_NORMAL_MAX_LEN_ERROR)

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

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ struct mt7603_dev { 
	u32 false_cca_ofdm, false_cca_cck;

	unsigned long last_cca_adj;



	__le32 rx_ampdu_ts;

	u8 rssi_offset[3];



	u8 slottime;

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

+14 −0
Original line number Diff line number Diff line
@@ -93,6 +93,20 @@ int mt7615_mac_fill_rx(struct mt7615_dev *dev, struct sk_buff *skb) 
		status->flag |= RX_FLAG_MMIC_STRIPPED | RX_FLAG_MIC_STRIPPED;

	}



	if (!(rxd2 & (MT_RXD2_NORMAL_NON_AMPDU_SUB |

		      MT_RXD2_NORMAL_NON_AMPDU))) {

		status->flag |= RX_FLAG_AMPDU_DETAILS;



		/* 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++;

		}

		dev->rx_ampdu_ts = rxd[12];



		status->ampdu_ref = dev->mt76.ampdu_ref;

	}



	remove_pad = rxd1 & MT_RXD1_NORMAL_HDR_OFFSET;



	if (rxd2 & MT_RXD2_NORMAL_MAX_LEN_ERROR)

CRA Git | Maintained and supported by SUSTech CRA and CCSE