[src/trunk]: src/sys/net80211 From: Anon Ymous

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c9c878a2e972
branches:  trunk
changeset: 758376:c9c878a2e972
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Nov 03 20:05:21 2010 +0000

description:
From: Anon Ymous
add a few constants so that if_otus.c compiles.

diffstat:

 sys/net80211/ieee80211.h |  13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diffs (43 lines):

diff -r e4b1f571cf3b -r c9c878a2e972 sys/net80211/ieee80211.h
--- a/sys/net80211/ieee80211.h  Wed Nov 03 20:03:54 2010 +0000
+++ b/sys/net80211/ieee80211.h  Wed Nov 03 20:05:21 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211.h,v 1.20 2008/11/06 03:28:59 dyoung Exp $    */
+/*     $NetBSD: ieee80211.h,v 1.21 2010/11/03 20:05:21 christos Exp $  */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -159,7 +159,8 @@
 #define        IEEE80211_FC1_RETRY                     0x08
 #define        IEEE80211_FC1_PWR_MGT                   0x10
 #define        IEEE80211_FC1_MORE_DATA                 0x20
-#define        IEEE80211_FC1_WEP                       0x40
+#define        IEEE80211_FC1_PROTECTED                 0x40
+#define        IEEE80211_FC1_WEP                       0x40    /* pre-RSNA compat */
 #define        IEEE80211_FC1_ORDER                     0x80
 
 #define        IEEE80211_SEQ_FRAG_MASK                 0x000f
@@ -402,6 +403,7 @@
        IEEE80211_ELEMID_TIM            = 5,
        IEEE80211_ELEMID_IBSSPARMS      = 6,
        IEEE80211_ELEMID_COUNTRY        = 7,
+       IEEE80211_ELEMID_EDCAPARMS      = 12,
        IEEE80211_ELEMID_CHALLENGE      = 16,
        /* 17-31 reserved for challenge text extension */
        IEEE80211_ELEMID_PWRCNSTR       = 32,
@@ -415,10 +417,13 @@
        IEEE80211_ELEMID_QUIET          = 40,
        IEEE80211_ELEMID_IBSSDFS        = 41,
        IEEE80211_ELEMID_ERP            = 42,
-       IEEE80211_ELEMID_HTCAP          = 45,
+       IEEE80211_ELEMID_HTCAP          = 45,   /* 11n */
+       IEEE80211_ELEMID_QOS_CAP        = 46,
        IEEE80211_ELEMID_RSN            = 48,
        IEEE80211_ELEMID_XRATES         = 50,
-       IEEE80211_ELEMID_HTINFO         = 61,
+       IEEE80211_ELEMID_TIE            = 56,   /* 11r */
+       IEEE80211_ELEMID_HTINFO         = 61,   /* 11n */
+       IEEE80211_ELEMID_MMIE           = 76,   /* 11w */
        IEEE80211_ELEMID_TPC            = 150,
        IEEE80211_ELEMID_CCKM           = 156,
        IEEE80211_ELEMID_VENDOR         = 221   /* vendor private */