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: Felix Fietkau <nbd@nbd.name>
Link: https://patch.msgid.link/e6fee6eed49b105261830db1c74f13841fb9616c.1728462320.git-series.nbd@nbd.name
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 32bdda90a4ac9dc760e3508170a8b1f079f1a172..d4f23224eff98b34e431ba03f385dd86550a226c 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -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;
 };

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index d7b294221d43ef076cb0722b3f5f3368bfe8bc32..a34523bbd156e910e6c988356503626e877cb47c 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -508,18 +508,13 @@ 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;
                *pos++ = 0;
        }