Module Name: src
Committed By: christos
Date: Wed Nov 3 20:05:22 UTC 2010
Modified Files:
src/sys/net80211: ieee80211.h
Log Message:
From: Anon Ymous
add a few constants so that if_otus.c compiles.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/net80211/ieee80211.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net80211/ieee80211.h
diff -u src/sys/net80211/ieee80211.h:1.20 src/sys/net80211/ieee80211.h:1.21
--- src/sys/net80211/ieee80211.h:1.20 Wed Nov 5 22:28:59 2008
+++ src/sys/net80211/ieee80211.h Wed Nov 3 16:05:21 2010
@@ -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 */
