From 57f78a351ed1be718fff8accec46f3c7e30b6d46 Mon Sep 17 00:00:00 2001
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Tue, 5 Apr 2016 22:01:56 +0000
Subject: [PATCH] [net80211] rename 11n rate macros into a useful spot

* begin moving the 11n macros out of ieee80211_phy.c and
  into a header so they can be used elsewhere.

* rename some of them into the IEEE80211_* namespace.

* convert HT_RC_2_MCS() to work with three-stream rates.
---
 sys/net80211/ieee80211_phy.c | 2 +-
 sys/net80211/ieee80211_phy.h | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sys/net80211/ieee80211_phy.c b/sys/net80211/ieee80211_phy.c
index 4242ac0ec5d..16bbb2aec41 100644
--- a/sys/net80211/ieee80211_phy.c
+++ b/sys/net80211/ieee80211_phy.c
@@ -590,7 +590,7 @@ static const uint16_t ht40_bps[32] = {
 #define	HT_STF		4
 #define	HT_LTF(n)	((n) * 4)
 
-#define	HT_RC_2_MCS(_rc)	((_rc) & 0xf)
+#define	HT_RC_2_MCS(_rc)	((_rc) & 0x1f)
 #define	HT_RC_2_STREAMS(_rc)	((((_rc) & 0x78) >> 3) + 1)
 #define	IS_HT_RATE(_rc)		( (_rc) & IEEE80211_RATE_MCS)
 
diff --git a/sys/net80211/ieee80211_phy.h b/sys/net80211/ieee80211_phy.h
index cb6b358d2b7..7970388b3e4 100644
--- a/sys/net80211/ieee80211_phy.h
+++ b/sys/net80211/ieee80211_phy.h
@@ -194,6 +194,14 @@ uint8_t		ieee80211_plcp2rate(uint8_t, enum ieee80211_phytype);
  */
 uint8_t		ieee80211_rate2plcp(int, enum ieee80211_phytype);
 
+/*
+ * 802.11n rate manipulation.
+ */
+
+#define	IEEE80211_HT_RC_2_MCS(_rc)	((_rc) & 0x1f)
+#define	IEEE80211_HT_RC_2_STREAMS(_rc)	((((_rc) & 0x78) >> 3) + 1)
+#define	IEEE80211_IS_HT_RATE(_rc)		( (_rc) & IEEE80211_RATE_MCS)
+
 uint32_t	ieee80211_compute_duration_ht(uint32_t frameLen,
 			uint16_t rate, int streams, int isht40,
 			int isShortGI);