summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/sys
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/sys')
-rw-r--r--usr/src/uts/common/sys/Makefile3
-rw-r--r--usr/src/uts/common/sys/net80211.h6
-rw-r--r--usr/src/uts/common/sys/net80211_crypto.h22
-rw-r--r--usr/src/uts/common/sys/net80211_proto.h6
4 files changed, 28 insertions, 9 deletions
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 9ec961664f..d0d531088f 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -383,6 +383,9 @@ CHKHDRS= \
nbmlock.h \
ndifm.h \
ndi_impldefs.h \
+ net80211.h \
+ net80211_crypto.h \
+ net80211_proto.h \
netconfig.h \
neti.h \
netstack.h \
diff --git a/usr/src/uts/common/sys/net80211.h b/usr/src/uts/common/sys/net80211.h
index 27bc20522a..39d6abdf6f 100644
--- a/usr/src/uts/common/sys/net80211.h
+++ b/usr/src/uts/common/sys/net80211.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -35,11 +35,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifndef _SYS_NET80211_H
#define _SYS_NET80211_H
+#pragma ident "%Z%%M% %I% %E% SMI"
+
#include <sys/mac.h>
#include <sys/ethernet.h>
#include <sys/net80211_proto.h>
diff --git a/usr/src/uts/common/sys/net80211_crypto.h b/usr/src/uts/common/sys/net80211_crypto.h
index 1d0bf250ec..b1c7d149df 100644
--- a/usr/src/uts/common/sys/net80211_crypto.h
+++ b/usr/src/uts/common/sys/net80211_crypto.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -35,11 +35,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifndef _SYS_NET80211_CRYPTO_H
#define _SYS_NET80211_CRYPTO_H
+#pragma ident "%Z%%M% %I% %E% SMI"
+
#include <sys/types.h>
#include <sys/mac.h>
#include <sys/net80211_proto.h>
@@ -52,6 +52,20 @@
extern "C" {
#endif
+#define IEEE80211_MAX_WPA_IE 40 /* IEEE802.11i */
+/*
+ * Max size of optional information elements. We artificially
+ * constrain this; it's limited only by the max frame size (and
+ * the max parameter size of the wireless extensions).
+ */
+#define IEEE80211_MAX_OPT_IE 256
+
+#define IEEE80211_MLME_ASSOC 1 /* associate station */
+#define IEEE80211_MLME_DISASSOC 2 /* disassociate station */
+#define IEEE80211_MLME_DEAUTH 3 /* deauthenticate station */
+#define IEEE80211_MLME_AUTHORIZE 4 /* authorize station */
+#define IEEE80211_MLME_UNAUTHORIZE 5 /* unauthorize station */
+
/*
* NB: these values are ordered carefully; there are lots of
* of implications in any reordering.
@@ -84,6 +98,8 @@ extern "C" {
#define IEEE80211_KEY_COMMON /* common flags passed in by apps */ \
(IEEE80211_KEY_XMIT | IEEE80211_KEY_RECV | IEEE80211_KEY_GROUP)
+#define IEEE80211_KEY_DEFAULT 0x80 /* default xmit key */
+
/* WEP */
#define IEEE80211_WEP_KEYLEN 5 /* 40bit */
#define IEEE80211_WEP_IVLEN 3 /* 24bit */
diff --git a/usr/src/uts/common/sys/net80211_proto.h b/usr/src/uts/common/sys/net80211_proto.h
index 8d053fcd42..5df0c7aafa 100644
--- a/usr/src/uts/common/sys/net80211_proto.h
+++ b/usr/src/uts/common/sys/net80211_proto.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -35,11 +35,11 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifndef _SYS_NET80211_PROTO_H
#define _SYS_NET80211_PROTO_H
+#pragma ident "%Z%%M% %I% %E% SMI"
+
/*
* 802.11 protocol definitions
*/