Commit 006a97ce authored by Felix Fietkau's avatar Felix Fietkau Committed by Johannes Berg
Browse files

wifi: mac80211: remove status->ampdu_delimiter_crc 



This was never used by any driver, so remove it to free up some space.

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/e6fee6eed49b105261830db1c74f13841fb9616c.1728462320.git-series.nbd@nbd.name


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent ebda716e

include/net/mac80211.h

+1 −5
Original line number Diff line number Diff line
@@ -1463,8 +1463,6 @@ ieee80211_tx_info_clear_status(struct ieee80211_tx_info *info) 
 * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU

 * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected

 *	on this subframe

 * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC

 *	is stored in the @ampdu_delimiter_crc field)

 * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was

 *	done by the hardware

 * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without
@@ -1536,7 +1534,7 @@ enum mac80211_rx_flags { 
	RX_FLAG_AMPDU_LAST_KNOWN	= BIT(12),

	RX_FLAG_AMPDU_IS_LAST		= BIT(13),

	RX_FLAG_AMPDU_DELIM_CRC_ERROR	= BIT(14),

	RX_FLAG_AMPDU_DELIM_CRC_KNOWN	= BIT(15),

	/* one free bit at 15 */

	RX_FLAG_MACTIME			= BIT(16) | BIT(17),

	RX_FLAG_MACTIME_PLCP_START	= 1 << 16,

	RX_FLAG_MACTIME_START		= 2 << 16,
@@ -1633,7 +1631,6 @@ enum mac80211_rx_encoding { 
 * @rx_flags: internal RX flags for mac80211

 * @ampdu_reference: A-MPDU reference number, must be a different value for

 *	each A-MPDU but the same for each subframe within one A-MPDU

 * @ampdu_delimiter_crc: A-MPDU delimiter CRC

 * @zero_length_psdu_type: radiotap type of the 0-length PSDU

 * @link_valid: if the link which is identified by @link_id is valid. This flag

 *	is set only when connection is MLO.
@@ -1671,7 +1668,6 @@ struct ieee80211_rx_status { 
	s8 signal;

	u8 chains;

	s8 chain_signal[IEEE80211_MAX_CHAINS];

	u8 ampdu_delimiter_crc;

	u8 zero_length_psdu_type;

	u8 link_valid:1, link_id:4;

};

net/mac80211/rx.c

+1 −6
Original line number Diff line number Diff line
@@ -508,17 +508,12 @@ ieee80211_add_rx_radiotap_header(struct ieee80211_local *local, 
			flags |= IEEE80211_RADIOTAP_AMPDU_IS_LAST;

		if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_ERROR)

			flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR;

		if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_KNOWN)

			flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN;

		if (status->flag & RX_FLAG_AMPDU_EOF_BIT_KNOWN)

			flags |= IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN;

		if (status->flag & RX_FLAG_AMPDU_EOF_BIT)

			flags |= IEEE80211_RADIOTAP_AMPDU_EOF;

		put_unaligned_le16(flags, pos);

		pos += 2;

		if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_KNOWN)

			*pos++ = status->ampdu_delimiter_crc;

		else

		*pos++ = 0;

		*pos++ = 0;

	}