summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2007-07-03 15:22:16 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2007-07-03 15:22:16 +0000
commitd9f03cad8db18af64cbdfa67a76f69a514dd49be (patch)
treef7888b5b44b4fc4119d0a1f2235d23d3ae48c658 /sys
parent3e4bff4b249342451a1e143511f72d3626d7659d (diff)
Backout part of 1.20 because IEEE80211_AUTH_ALGORITHM() and friends are used
by hostapd and tcpdump. Now tcpdump and hostapd should build again.
Diffstat (limited to 'sys')
-rw-r--r--sys/net80211/ieee80211.h20
1 files changed, 19 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211.h b/sys/net80211/ieee80211.h
index bdd49ae187a..f0633c5c3ae 100644
--- a/sys/net80211/ieee80211.h
+++ b/sys/net80211/ieee80211.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ieee80211.h,v 1.26 2007/07/03 15:02:07 claudio Exp $ */
+/* $OpenBSD: ieee80211.h,v 1.27 2007/07/03 15:22:15 claudio Exp $ */
/* $NetBSD: ieee80211.h,v 1.6 2004/04/30 23:51:53 dyoung Exp $ */
/*-
@@ -401,6 +401,24 @@ enum ieee80211_edca_ac {
#define IEEE80211_OUI ((const u_int8_t[]){ 0x00, 0x0f, 0xac })
#define MICROSOFT_OUI ((const u_int8_t[]){ 0x00, 0x50, 0xf2 })
+/*
+ * AUTH management packets
+ *
+ * octet algo[2]
+ * octet seq[2]
+ * octet status[2]
+ * octet chal.id
+ * octet chal.length
+ * octet chal.text[253]
+ */
+
+#define IEEE80211_AUTH_ALGORITHM(auth) \
+ ((auth)[0] | ((auth)[1] << 8))
+#define IEEE80211_AUTH_TRANSACTION(auth) \
+ ((auth)[2] | ((auth)[3] << 8))
+#define IEEE80211_AUTH_STATUS(auth) \
+ ((auth)[4] | ((auth)[5] << 8))
+
#define IEEE80211_AUTH_ALG_OPEN 0x0000
#define IEEE80211_AUTH_ALG_SHARED 0x0001
#define IEEE80211_AUTH_ALG_LEAP 0x0080