@@ -108,55 +108,7 @@ struct ath11k_generic_iter {
WMI_VHT_CAP_RX_FIXED_ANT | \
WMI_VHT_CAP_TX_FIXED_ANT)
-/* VHT capability flags */
-/* B0-B1 Maximum MPDU Length */
-#define IEEE80211_VHTCAP_MAX_MPDU_LEN_3839 0x00000000
-#define IEEE80211_VHTCAP_MAX_MPDU_LEN_7935 0x00000001
-#define IEEE80211_VHTCAP_MAX_MPDU_LEN_11454 0x00000002
-
-/* B2-B3 Supported Channel Width */
-#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80 0x00000000
-#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_160 0x00000004
-#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_80_160 0x00000008
-#define IEEE80211_VHTCAP_SUP_CHAN_WIDTH_S 2
-
-#define IEEE80211_VHTCAP_RX_LDPC 0x00000010
-#define IEEE80211_VHTCAP_SHORTGI_80 0x00000020
-#define IEEE80211_VHTCAP_SHORTGI_160 0x00000040
-#define IEEE80211_VHTCAP_TX_STBC 0x00000080
-#define IEEE80211_VHTCAP_TX_STBC_S 7
-
-#define IEEE80211_VHTCAP_RX_STBC 0x00000700
-#define IEEE80211_VHTCAP_RX_STBC_S 8
-
-#define IEEE80211_VHTCAP_SU_BFORMER 0x00000800
-#define IEEE80211_VHTCAP_SU_BFORMER_S 11
-#define IEEE80211_VHTCAP_SU_BFORMEE 0x00001000
-#define IEEE80211_VHTCAP_SU_BFORMEE_S 12
-
-#define IEEE80211_VHTCAP_BF_MAX_ANT 0x0000E000
-#define IEEE80211_VHTCAP_BF_MAX_ANT_S 13
-
-#define IEEE80211_VHTCAP_STS_CAP_S 13
-#define IEEE80211_VHTCAP_STS_CAP_M 0x7
-
-#define IEEE80211_VHTCAP_SOUND_DIM 0x00070000
-#define IEEE80211_VHTCAP_SOUND_DIM_S 16
-
-#define IEEE80211_VHTCAP_MU_BFORMER 0x00080000
-#define IEEE80211_VHTCAP_MU_BFORMER_S 19
-#define IEEE80211_VHTCAP_MU_BFORMEE 0x00100000
-#define IEEE80211_VHTCAP_MU_BFORMEE_S 20
-#define IEEE80211_VHTCAP_TXOP_PS 0x00200000
-#define IEEE80211_VHTCAP_PLUS_HTC_VHT 0x00400000
-
-#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_FACTOR 13
-#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP 0x03800000
-#define IEEE80211_VHTCAP_MAX_AMPDU_LEN_EXP_S 23
-
-#define IEEE80211_VHTCAP_LINK_ADAPT 0x0C000000
-#define IEEE80211_VHTCAP_RESERVED 0xF0000000
-
+/* FIXME: should these be in ieee80211.h? */
#define IEEE80211_VHT_MCS_SUPPORT_0_11_MASK GENMASK(23, 16)
#define IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11 BIT(24)
I think these should be in ieee80211.h. Also add a fixme comment for the two VHT MCS defines which are used. Signed-off-by: Kalle Valo <kvalo@codeaurora.org> --- drivers/net/wireless/ath/ath11k/mac.h | 50 +-------------------------------- 1 file changed, 1 insertion(+), 49 deletions(-)