Author: adrian
Date: Sat Jan 7 01:49:34 2017
New Revision: 311573
URL: https://svnweb.freebsd.org/changeset/base/311573
Log:
[net80211] Remove duplicate VHTOPMODE configuration bits.
These came from Linux mac80211 headers and are configuration bits, not
VHTOPMODE field parameters.
Whilst here, add the field names for the VHTCAP bits.
Tested:
* ath10k, 11ac STA mode
Modified:
head/sys/net80211/ieee80211.h
Modified: head/sys/net80211/ieee80211.h
==============================================================================
--- head/sys/net80211/ieee80211.h Sat Jan 7 00:59:06 2017
(r311572)
+++ head/sys/net80211/ieee80211.h Sat Jan 7 01:49:34 2017
(r311573)
@@ -737,16 +737,6 @@ struct ieee80211_ie_htinfo {
* 802.11ac definitions - 802.11ac-2013 .
*/
-/* VHT opmode bits */
-#define IEEE80211_VHT_OPMODE_CHANWIDTH_MASK 3
-#define IEEE80211_VHT_OPMODE_CHANWIDTH_20MHZ 0
-#define IEEE80211_VHT_OPMODE_CHANWIDTH_40MHZ 1
-#define IEEE80211_VHT_OPMODE_CHANWIDTH_80MHZ 2
-#define IEEE80211_VHT_OPMODE_CHANWIDTH_160MHZ 3
-#define IEEE80211_VHT_OPMODE_RX_NSS_MASK 0x70
-#define IEEE80211_VHT_OPMODE_RX_NSS_SHIFT 4
-#define IEEE80211_VHT_OPMODE_RX_NSS_TYPE_BF 0x80
-
/*
* Maximum length of A-MPDU that the STA can RX in VHT.
* Length = 2 ^ (13 + max_ampdu_length_exp) - 1 (octets)
@@ -787,6 +777,7 @@ struct ieee80211_ie_vhtcap {
struct ieee80211_vht_mcs_info supp_mcs;
} __packed;
+/* VHT operation mode subfields - 802.11ac-2013 Table 8.183x */
#define IEEE80211_VHT_CHANWIDTH_USE_HT 0 /* Use HT IE
for chw */
#define IEEE80211_VHT_CHANWIDTH_80MHZ 1 /* 80MHz */
#define IEEE80211_VHT_CHANWIDTH_160MHZ 2 /* 160MHz */
@@ -839,6 +830,11 @@ struct ieee80211_ie_vht_operation {
#define IEEE80211_VHTCAP_RX_ANTENNA_PATTERN 0x10000000
#define IEEE80211_VHTCAP_TX_ANTENNA_PATTERN 0x20000000
+#define IEEE80211_VHTCAP_BITS \
+ "\20\1MPDU7991\2MPDU11454\3CHAN160\4CHAN8080\5RXLDPC\6SHORTGI80" \
+ "\7SHORTGI160\10RXSTBC1\11RXSTBC2\12RXSTBC3\13RXSTBC4\14BFERCAP" \
+ "\15BFEECAP\27VHT"
+
/*
* VHT Transmit Power Envelope element - 802.11ac-2013 8.4.2.164
*
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
