[src/trunk]: src/sys/dev/pcmcia undo part of the previous commit. I'll just ...

[explorer <explorer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/837ffdb6e2bb
branches:  trunk
changeset: 481706:837ffdb6e2bb
user:      explorer <explorer%NetBSD.org@localhost>
date:      Fri Feb 04 06:22:52 2000 +0000

description:
undo part of the previous commit.  I'll just steal the code from freebsd,
to minimize differences between the drivers.

diffstat:

 sys/dev/pcmcia/if_wireg.h |  51 +---------------------------------------------
 1 files changed, 2 insertions(+), 49 deletions(-)

diffs (79 lines):

diff -r d01223e63c17 -r 837ffdb6e2bb sys/dev/pcmcia/if_wireg.h
--- a/sys/dev/pcmcia/if_wireg.h Fri Feb 04 05:30:55 2000 +0000
+++ b/sys/dev/pcmcia/if_wireg.h Fri Feb 04 06:22:52 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wireg.h,v 1.3 2000/02/04 02:03:02 explorer Exp $    */
+/*     $NetBSD: if_wireg.h,v 1.4 2000/02/04 06:22:52 explorer Exp $    */
 
 /*
  * Copyright (c) 1997, 1998, 1999
@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- *     $Id: if_wireg.h,v 1.3 2000/02/04 02:03:02 explorer Exp $
+ *     $Id: if_wireg.h,v 1.4 2000/02/04 06:22:52 explorer Exp $
  */
 
 /*
@@ -451,26 +451,6 @@
 };
 
 /*
- * Select de/encryption of tx/rx frames.
- */
-#define WI_RID_ENCRYPTIONSELECT        0xFC20
-struct wi_ltv_encryptionselect {
-       u_int16_t               wi_len;
-       u_int16_t               wi_type;
-       u_int16_t               wi_encryption_enabled;
-};
-
-/*
- * Select de/encryption of tx/rx frames.
- */
-#define WI_RID_AUTHSELECT      0xFC21
-struct wi_ltv_authselect {
-       u_int16_t               wi_len;
-       u_int16_t               wi_type;
-       u_int16_t               wi_auth_type;
-};
-
-/*
  * Multicast addresses to be put in filter. We're
  * allowed up to 16 addresses in the filter.
  */
@@ -503,33 +483,6 @@
 #define WI_RID_PROMISC         0xFC85
 
 /*
- * Set default keys.
- */
-#define WI_RID_KEYS            0xFCB0
-struct wi_ltv_keys {
-       u_int16_t               wi_len;
-       u_int16_t               wi_type;
-       u_int16_t               wi_keylen_0;
-       u_int8_t                wi_key_0[14];
-       u_int16_t               wi_keylen_1;
-       u_int8_t                wi_key_1[14];
-       u_int16_t               wi_keylen_2;
-       u_int8_t                wi_key_2[14];
-       u_int16_t               wi_keylen_3;
-       u_int8_t                wi_key_3[14];
-};
-
-/*
- * Select key for tx
- */
-#define WI_RID_TXKEY           0xFCB1
-struct wi_ltv_txkey {
-       u_int16_t               wi_len;
-       u_int16_t               wi_type;
-       u_int16_t               wi_txkeyid;
-};
-
-/*
  * Auxiliary Timer tick interval
  */
 #define WI_RID_TICK_TIME       0xFCE0