diff options
author | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-26 19:20:28 +0000 |
---|---|---|
committer | Todd C. Miller <millert@cvs.openbsd.org> | 2002-04-26 19:20:28 +0000 |
commit | c1c9b523e8705a32c09b46583f39b5b7df36bcd8 (patch) | |
tree | 644d6d06056697bbb7d4a506ddda9df41359b912 | |
parent | 6fea8dbf2e2abf69151eefed7777d978b1c4137e (diff) |
We use wi_authtype, not wi_authmode to store the auth type (open system
or shared key).
-rw-r--r-- | sys/dev/ic/if_wi.c | 6 | ||||
-rw-r--r-- | sys/dev/ic/if_wivar.h | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index aed2982fc49..4cf7d7b8ca2 100644 --- a/sys/dev/ic/if_wi.c +++ b/sys/dev/ic/if_wi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi.c,v 1.56 2002/04/23 22:25:29 millert Exp $ */ +/* $OpenBSD: if_wi.c,v 1.57 2002/04/26 19:20:27 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -124,7 +124,7 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) && !defined(__OpenBSD__) static const char rcsid[] = - "$OpenBSD: if_wi.c,v 1.56 2002/04/23 22:25:29 millert Exp $"; + "$OpenBSD: if_wi.c,v 1.57 2002/04/26 19:20:27 millert Exp $"; #endif /* lint */ #ifdef foo @@ -953,7 +953,7 @@ wi_write_record(sc, ltv) * IEEE80211_AUTH_SHARED since Symbol cards * have 2 shared key modes. */ - if (sc->wi_authmode != IEEE80211_AUTH_OPEN || + if (sc->wi_authtype != IEEE80211_AUTH_OPEN || sc->sc_firmware_type == WI_SYMBOL) val |= EXCLUDE_UNENCRYPTED; /* TX encryption is broken in Host AP mode. */ diff --git a/sys/dev/ic/if_wivar.h b/sys/dev/ic/if_wivar.h index d56f0cdb29a..382f55319ab 100644 --- a/sys/dev/ic/if_wivar.h +++ b/sys/dev/ic/if_wivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wivar.h,v 1.10 2002/04/11 00:08:25 millert Exp $ */ +/* $OpenBSD: if_wivar.h,v 1.11 2002/04/26 19:20:27 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -73,7 +73,6 @@ struct wi_softc { u_int8_t wi_txbuf[1596]; int wi_use_wep; - int wi_authmode; int wi_tx_key; struct wi_ltv_keys wi_keys; struct wi_counters wi_stats; |