git: b2c90d106c66 - main - LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file

The branch main has been updated by bz:

URL: https://cgit.FreeBSD.org/src/commit/?id=b2c90d106c66daf6dc7fb300c250b4ad0aa274f5

commit b2c90d106c66daf6dc7fb300c250b4ad0aa274f5
Author:     Bjoern A. Zeeb <bz@FreeBSD.org>
AuthorDate: 2026-01-20 22:47:13 +0000
Commit:     Bjoern A. Zeeb <bz@FreeBSD.org>
CommitDate: 2026-01-21 18:31:07 +0000

    LinuxKPI: 802.11: rename enum ieee80211_tx_rate_flags and move file
    
    What we used to call enum ieee80211_tx_rate_flags is now used as
    enum mac80211_rate_control_flags for the ieee80211_tx_rate.flags
    in rtw89(4).  Rename the enum and move it to mac80211 as it seems
    to belong there.
    
    Sponsonred by:  The FreeBSD Foundation
    MFC after:      3 days
---
 sys/compat/linuxkpi/common/include/linux/ieee80211.h | 12 ------------
 sys/compat/linuxkpi/common/include/net/mac80211.h    | 15 +++++++++++++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/sys/compat/linuxkpi/common/include/linux/ieee80211.h b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
index c81ddf7d24b2..a9033581a315 100644
--- a/sys/compat/linuxkpi/common/include/linux/ieee80211.h
+++ b/sys/compat/linuxkpi/common/include/linux/ieee80211.h
@@ -480,18 +480,6 @@ enum ieee80211_tx_control_flags {
 	IEEE80211_TX_CTRL_MLO_LINK		= 0xF0000000,	/* This is IEEE80211_LINK_UNSPECIFIED on the high bits. */
 };
 
-enum ieee80211_tx_rate_flags {
-	/* XXX TODO .. right shift numbers */
-	IEEE80211_TX_RC_40_MHZ_WIDTH		= BIT(0),
-	IEEE80211_TX_RC_80_MHZ_WIDTH		= BIT(1),
-	IEEE80211_TX_RC_160_MHZ_WIDTH		= BIT(2),
-	IEEE80211_TX_RC_GREEN_FIELD		= BIT(3),
-	IEEE80211_TX_RC_MCS			= BIT(4),
-	IEEE80211_TX_RC_SHORT_GI		= BIT(5),
-	IEEE80211_TX_RC_VHT_MCS			= BIT(6),
-	IEEE80211_TX_RC_USE_SHORT_PREAMBLE	= BIT(7),
-};
-
 #define	IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED	-128
 
 #define	IEEE80211_HT_CTL_LEN	4
diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h
index 6e2f3f2d8781..8d3d04c9afe5 100644
--- a/sys/compat/linuxkpi/common/include/net/mac80211.h
+++ b/sys/compat/linuxkpi/common/include/net/mac80211.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2020-2025 The FreeBSD Foundation
+ * Copyright (c) 2020-2026 The FreeBSD Foundation
  * Copyright (c) 2020-2025 Bjoern A. Zeeb
  *
  * This software was developed by Björn Zeeb under sponsorship from
@@ -789,10 +789,21 @@ struct ieee80211_tx_queue_params {
 	struct ieee80211_he_mu_edca_param_ac_rec	mu_edca_param_rec;
 };
 
+enum mac80211_rate_control_flags {
+	IEEE80211_TX_RC_40_MHZ_WIDTH		= BIT(0),
+	IEEE80211_TX_RC_80_MHZ_WIDTH		= BIT(1),
+	IEEE80211_TX_RC_160_MHZ_WIDTH		= BIT(2),
+	IEEE80211_TX_RC_GREEN_FIELD		= BIT(3),
+	IEEE80211_TX_RC_MCS			= BIT(4),
+	IEEE80211_TX_RC_SHORT_GI		= BIT(5),
+	IEEE80211_TX_RC_VHT_MCS			= BIT(6),
+	IEEE80211_TX_RC_USE_SHORT_PREAMBLE	= BIT(7),
+};
+
 struct ieee80211_tx_rate {
 	uint8_t		idx;
 	uint16_t	count:5,
-			flags:11;
+			flags:11;	/* enum mac80211_rate_control_flags */
 };
 
 enum ieee80211_vif_driver_flags {