summaryrefslogtreecommitdiff
path: root/sys/dev/ic/ar5211reg.h
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2005-03-20 04:21:56 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2005-03-20 04:21:56 +0000
commit3a055a6eeeb7007a188f09910d2a947f3a0a4daa (patch)
treee7e03f4244d77d55ebf3f46a25639130a2414a8f /sys/dev/ic/ar5211reg.h
parentde6b5a33f143a91a058e47a2024a2c45ebd708b8 (diff)
some fixes for wep and reset.
btw.: this is a commit using an ar5212 in 11b mode... ok deraadt@, krw@
Diffstat (limited to 'sys/dev/ic/ar5211reg.h')
-rw-r--r--sys/dev/ic/ar5211reg.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/dev/ic/ar5211reg.h b/sys/dev/ic/ar5211reg.h
index 7ffe70b110f..05135bd5ea1 100644
--- a/sys/dev/ic/ar5211reg.h
+++ b/sys/dev/ic/ar5211reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ar5211reg.h,v 1.3 2005/03/19 17:27:46 reyk Exp $ */
+/* $OpenBSD: ar5211reg.h,v 1.4 2005/03/20 04:21:55 reyk Exp $ */
/*
* Copyright (c) 2004, 2005 Reyk Floeter <reyk@vantronix.net>
@@ -890,14 +890,18 @@ typedef enum {
*/
#define AR5K_AR5211_KEYTABLE_0 0x8800
#define AR5K_AR5211_KEYTABLE(n) (AR5K_AR5211_KEYTABLE_0 + ((n) * 32))
+#define AR5K_AR5211_KEYTABLE_OFF(_n, x) (AR5K_AR5211_KEYTABLE(_n) + (x << 2))
+#define AR5K_AR5211_KEYTABLE_TYPE(_n) AR5K_AR5211_KEYTABLE_OFF(_n, 5)
#define AR5K_AR5211_KEYTABLE_TYPE_40 0x00000000
#define AR5K_AR5211_KEYTABLE_TYPE_104 0x00000001
#define AR5K_AR5211_KEYTABLE_TYPE_128 0x00000003
#define AR5K_AR5211_KEYTABLE_TYPE_AES 0x00000005
#define AR5K_AR5211_KEYTABLE_TYPE_NULL 0x00000007
+#define AR5K_AR5211_KEYTABLE_MAC0(_n) AR5K_AR5211_KEYTABLE_OFF(_n, 6)
+#define AR5K_AR5211_KEYTABLE_MAC1(_n) AR5K_AR5211_KEYTABLE_OFF(_n, 7)
#define AR5K_AR5211_KEYTABLE_VALID 0x00008000
-#define AR5K_AR5211_KEYTABLE_SIZE 64
+#define AR5K_AR5211_KEYTABLE_SIZE 128
#define AR5K_AR5211_KEYCACHE_SIZE 8
/*