diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h
--- a/sys/compat/linuxkpi/common/include/net/cfg80211.h
+++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h
@@ -129,12 +129,6 @@
 	int	orig_mpwr;
 };
 
-enum ieee80211_vht_mcs_support {
-	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_7,
-	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_8,
-	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_9,
-};
-
 struct cfg80211_bitrate_mask {
 	/* TODO FIXME */
 	/* This is so weird but nothing else works out...*/
@@ -1700,19 +1694,6 @@
 #ifndef LINUXKPI_NET80211
 #define	ieee80211_channel		linuxkpi_ieee80211_channel
 #define	ieee80211_regdomain		linuxkpi_ieee80211_regdomain
-/* net80211::IEEE80211_VHT_MCS_SUPPORT_0_n() conflicts */
-#if defined(IEEE80211_VHT_MCS_SUPPORT_0_7)
-#undef	IEEE80211_VHT_MCS_SUPPORT_0_7
-#endif
-#if defined(IEEE80211_VHT_MCS_SUPPORT_0_8)
-#undef	IEEE80211_VHT_MCS_SUPPORT_0_8
-#endif
-#if defined(IEEE80211_VHT_MCS_SUPPORT_0_9)
-#undef	IEEE80211_VHT_MCS_SUPPORT_0_9
-#endif
-#define	IEEE80211_VHT_MCS_SUPPORT_0_7	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_7
-#define	IEEE80211_VHT_MCS_SUPPORT_0_8	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_8
-#define	IEEE80211_VHT_MCS_SUPPORT_0_9	LKPI_IEEE80211_VHT_MCS_SUPPORT_0_9
 #endif
 
 #endif	/* _LINUXKPI_NET_CFG80211_H */
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -769,10 +769,14 @@
  * + rx_mcs_map/tx_mcs_map: bitmap of per-stream supported MCS;
  *    2 bits each.
  */
-#define	IEEE80211_VHT_MCS_SUPPORT_0_7		0	/* MCS0-7 */
-#define	IEEE80211_VHT_MCS_SUPPORT_0_8		1	/* MCS0-8 */
-#define	IEEE80211_VHT_MCS_SUPPORT_0_9		2	/* MCS0-9 */
-#define	IEEE80211_VHT_MCS_NOT_SUPPORTED		3	/* not supported */
+
+/* 802.11ac-2013, 8.4.2.160.3 Supported VHT-MCS and NSS Set field */
+enum ieee80211_vht_mcs_support {
+	IEEE80211_VHT_MCS_SUPPORT_0_7		= 0,	/* MCS0-7 */
+	IEEE80211_VHT_MCS_SUPPORT_0_8		= 1,	/* MCS0-8 */
+	IEEE80211_VHT_MCS_SUPPORT_0_9		= 2,	/* MCS0-9 */
+	IEEE80211_VHT_MCS_NOT_SUPPORTED		= 3	/* not supported */
+};
 
 struct ieee80211_vht_mcs_info {
 	uint16_t rx_mcs_map;