PERFORCE change 118558 for review
Sam Leffler
sam at FreeBSD.org
Sun Apr 22 05:15:12 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=118558
Change 118558 by sam at sam_ebb on 2007/04/22 05:14:30
Minor sync w/ 11n work:
o add some sequence # defs needed for 11n
o add defines for QoS ack policies
o correct HT SMPS defs (use D1.10/2.0 values)
o sort IEEE80211_ELEMID_HTCAP
o add Broadcom OUI stuff needed for compatibility support
Affected files ...
.. //depot/projects/wifi/sys/net80211/ieee80211.h#19 edit
Differences ...
==== //depot/projects/wifi/sys/net80211/ieee80211.h#19 (text+ko) ====
@@ -167,7 +167,14 @@
#define IEEE80211_SEQ_FRAG_SHIFT 0
#define IEEE80211_SEQ_SEQ_MASK 0xfff0
#define IEEE80211_SEQ_SEQ_SHIFT 4
+#define IEEE80211_SEQ_RANGE 4096
+#define IEEE80211_SEQ_ADD(seq, incr) \
+ (((seq) + (incr)) & (IEEE80211_SEQ_RANGE-1))
+#define IEEE80211_SEQ_INC(seq) IEEE80211_SEQ_ADD(seq,1)
+#define IEEE80211_SEQ_SUB(a, b) \
+ (((a) + IEEE80211_SEQ_RANGE - (b)) & (IEEE80211_SEQ_RANGE-1))
+
#define IEEE80211_NWID_LEN 32
#define IEEE80211_QOS_TXOP 0x00ff
@@ -176,6 +183,8 @@
#define IEEE80211_QOS_AMSDU_S 7
#define IEEE80211_QOS_ACKPOLICY 0x60
#define IEEE80211_QOS_ACKPOLICY_S 5
+#define IEEE80211_QOS_ACKPOLICY_NOACK 0x20 /* No ACK required */
+#define IEEE80211_QOS_ACKPOLICY_BA 0x60 /* Block ACK */
#define IEEE80211_QOS_ESOP 0x10
#define IEEE80211_QOS_ESOP_S 4
#define IEEE80211_QOS_TID 0x0f
@@ -521,8 +530,8 @@
#define IEEE80211_HTCAP_SMPS 0x000c /* SM Power Save mode */
#define IEEE80211_HTCAP_SMPS_OFF 0x0000 /* none (static mode) */
#define IEEE80211_HTCAP_SMPS_DYNAMIC 0x0004 /* send RTS first */
-#define IEEE80211_HTCAP_SMPS_NA 0x0008 /* not applicable */
-#define IEEE80211_HTCAP_SMPS_ALL 0x000c /* no limitation */
+/* NB: SMPS value 2 is reserved */
+#define IEEE80211_HTCAP_SMPS_ENA 0x000c /* enabled */
#define IEEE80211_HTCAP_GREENFIELD 0x0010 /* Greenfield supported */
#define IEEE80211_HTCAP_SHORTGI20 0x0020 /* Short GI in 20MHz */
#define IEEE80211_HTCAP_SHORTGI40 0x0040 /* Short GI in 40MHz */
@@ -657,9 +666,9 @@
IEEE80211_ELEMID_QUIET = 40,
IEEE80211_ELEMID_IBSSDFS = 41,
IEEE80211_ELEMID_ERP = 42,
+ IEEE80211_ELEMID_HTCAP = 45,
IEEE80211_ELEMID_RSN = 48,
IEEE80211_ELEMID_XRATES = 50,
- IEEE80211_ELEMID_HTCAP = 45,
IEEE80211_ELEMID_HTINFO = 61,
IEEE80211_ELEMID_TPC = 150,
IEEE80211_ELEMID_CCKM = 156,
@@ -718,11 +727,15 @@
#define IEEE80211_ERP_USE_PROTECTION 0x02
#define IEEE80211_ERP_LONG_PREAMBLE 0x04
-#define ATH_OUI 0x7f0300 /* Atheros OUI */
+#define ATH_OUI 0x7f0300 /* Atheros OUI */
#define ATH_OUI_TYPE 0x01
#define ATH_OUI_SUBTYPE 0x01
#define ATH_OUI_VERSION 0x00
+#define BCM_OUI 0x4c9000 /* Broadcom OUI */
+#define BCM_OUI_HTCAP 51 /* pre-draft HTCAP ie */
+#define BCM_OUI_HTINFO 52 /* pre-draft HTINFO ie */
+
#define WPA_OUI 0xf25000
#define WPA_OUI_TYPE 0x01
#define WPA_VERSION 1 /* current supported version */
More information about the p4-projects
mailing list