diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index aa2ddb0968ec..93740eec36b3 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -798,37 +798,73 @@ struct ieee80211_ie_vht_operation {
 #define	IEEE80211_VHTCAP_MAX_MPDU_LENGTH_7991	0x00000001
 #define	IEEE80211_VHTCAP_MAX_MPDU_LENGTH_11454	0x00000002
 #define	IEEE80211_VHTCAP_MAX_MPDU_MASK		0x00000003
-#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ	0x00000004
-#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ	0x00000008
+#define	IEEE80211_VHTCAP_MAX_MPDU_MASK_S	0
+
 #define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK	0x0000000C
+#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_MASK_S	2
+#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_NONE		0
+#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160MHZ		1
+#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_160_80P80MHZ	2
+#define	IEEE80211_VHTCAP_SUPP_CHAN_WIDTH_RESERVED	3
+
 #define	IEEE80211_VHTCAP_RXLDPC		0x00000010
+#define	IEEE80211_VHTCAP_RXLDPC_S	4
+
 #define	IEEE80211_VHTCAP_SHORT_GI_80		0x00000020
+#define	IEEE80211_VHTCAP_SHORT_GI_80_S		5
+
 #define	IEEE80211_VHTCAP_SHORT_GI_160		0x00000040
+#define	IEEE80211_VHTCAP_SHORT_GI_160_S		6
+
 #define	IEEE80211_VHTCAP_TXSTBC		0x00000080
+#define	IEEE80211_VHTCAP_TXSTBC_S	7
+
 #define	IEEE80211_VHTCAP_RXSTBC_1		0x00000100
 #define	IEEE80211_VHTCAP_RXSTBC_2		0x00000200
 #define	IEEE80211_VHTCAP_RXSTBC_3		0x00000300
 #define	IEEE80211_VHTCAP_RXSTBC_4		0x00000400
 #define	IEEE80211_VHTCAP_RXSTBC_MASK		0x00000700
+#define	IEEE80211_VHTCAP_RXSTBC_MASK_S		8
+
 #define	IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE	0x00000800
+#define	IEEE80211_VHTCAP_SU_BEAMFORMER_CAPABLE_S	11
+
 #define	IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE	0x00001000
+#define	IEEE80211_VHTCAP_SU_BEAMFORMEE_CAPABLE_S	12
+
 #define	IEEE80211_VHTCAP_BEAMFORMEE_STS_SHIFT	13
 #define	IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK \
 	    (7 << IEEE80211_VHTCAP_BEAMFORMEE_STS_SHIFT)
+#define	IEEE80211_VHTCAP_BEAMFORMEE_STS_MASK_S	13
+
 #define	IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_SHIFT	16
 #define	IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK \
 	    (7 << IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_SHIFT)
+#define	IEEE80211_VHTCAP_SOUNDING_DIMENSIONS_MASK_S	16
+
 #define	IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE	0x00080000
+#define	IEEE80211_VHTCAP_MU_BEAMFORMER_CAPABLE_S	19
 #define	IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE	0x00100000
+#define	IEEE80211_VHTCAP_MU_BEAMFORMEE_CAPABLE_S	20
 #define	IEEE80211_VHTCAP_VHT_TXOP_PS		0x00200000
+#define	IEEE80211_VHTCAP_VHT_TXOP_PS_S		21
 #define	IEEE80211_VHTCAP_HTC_VHT		0x00400000
+#define	IEEE80211_VHTCAP_HTC_VHT_S		22
+
 #define	IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT	23
 #define	IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK \
 	    (7 << IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT)
+#define	IEEE80211_VHTCAP_MAX_A_MPDU_LENGTH_EXPONENT_MASK_S	23
+
+#define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MASK	0x0c000000
 #define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_UNSOL_MFB	0x08000000
 #define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MRQ_MFB	0x0c000000
+#define	IEEE80211_VHTCAP_VHT_LINK_ADAPTATION_VHT_MASK_S	26
+
 #define	IEEE80211_VHTCAP_RX_ANTENNA_PATTERN	0x10000000
+#define	IEEE80211_VHTCAP_RX_ANTENNA_PATTERN_S	28
 #define	IEEE80211_VHTCAP_TX_ANTENNA_PATTERN	0x20000000
+#define	IEEE80211_VHTCAP_TX_ANTENNA_PATTERN_S	29
 
 /*
  * XXX TODO: add the rest of the bits