summaryrefslogtreecommitdiff
path: root/sys/dev/pcmcia/if_wireg.h
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/pcmcia/if_wireg.h')
-rw-r--r--sys/dev/pcmcia/if_wireg.h34
1 files changed, 27 insertions, 7 deletions
diff --git a/sys/dev/pcmcia/if_wireg.h b/sys/dev/pcmcia/if_wireg.h
index d9c72d758d5..34759fd2a9c 100644
--- a/sys/dev/pcmcia/if_wireg.h
+++ b/sys/dev/pcmcia/if_wireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wireg.h,v 1.4 1999/11/05 04:25:30 angelos Exp $ */
+/* $OpenBSD: if_wireg.h,v 1.5 2000/02/03 00:56:45 angelos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -58,6 +58,27 @@ struct wi_counters {
u_int32_t wi_rx_msg_in_bad_msg_frags;
};
+/*
+ * Encryption controls. We can enable or disable encryption as
+ * well as specify up to 4 encryption keys. We can also specify
+ * which of the four keys will be used for transmit encryption.
+ */
+#define WI_RID_ENCRYPTION 0xFC20
+#define WI_RID_AUTHTYPE 0xFC21
+#define WI_RID_DEFLT_CRYPT_KEYS 0xFCB0
+#define WI_RID_TX_CRYPT_KEY 0xFCB1
+#define WI_RID_WEP_AVAIL 0xFD4F
+struct wi_key {
+ u_int16_t wi_keylen;
+ u_int8_t wi_keydat[14];
+};
+
+struct wi_ltv_keys {
+ u_int16_t wi_len;
+ u_int16_t wi_type;
+ struct wi_key wi_keys[4];
+};
+
struct wi_softc {
#ifndef __FreeBSD__
struct device sc_dev;
@@ -83,17 +104,16 @@ struct wi_softc {
char wi_node_name[32];
char wi_net_name[32];
char wi_ibss_name[32];
- u_int8_t wi_txbuf[1536];
+ u_int8_t wi_txbuf[1596];
+ int wi_has_wep;
+ int wi_use_wep;
+ int wi_tx_key;
+ struct wi_ltv_keys wi_keys;
struct wi_counters wi_stats;
-#ifdef __FreeBSD__
- int wi_unit;
- struct callout_handle wi_stat_ch;
-#else
void *sc_ih;
struct pcmcia_io_handle sc_pcioh;
int sc_io_window;
struct pcmcia_function *sc_pf;
-#endif /* __FreeBSD__ */
};
#define WI_TIMEOUT 65536