diff options
| author |   millert <millert@openbsd.org> | 2004-06-22 20:48:00 +0000 |
|---|---|---|
| committer | millert <millert@openbsd.org> | 2004-06-22 20:48:00 +0000 |
| commit | b7a980d0121851f1faded80a2740907ba6f46244 (patch) | |
| tree | 90d720561dc84e674df79707d8deff514a012b75 | |
| parent | do not bcopy wrong stuff there (diff) | |
| download | wireguard-openbsd-b7a980d0121851f1faded80a2740907ba6f46244.tar.xz wireguard-openbsd-b7a980d0121851f1faded80a2740907ba6f46244.zip | |
The Prism device driver's manual makes a distinction in naming of
config comands and other types but we don't so remove the CNF_ from
WI_RID_CNF_ENH_SECURITY and WI_RID_CNF_DBM_ADJUST for consistency
and compat with Net and Free.
| -rw-r--r-- | sys/dev/ic/if_wi.c | 12 | ||||
| -rw-r--r-- | sys/dev/ic/if_wi_ieee.h | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c index bc1c6ef54b6..7938abf52f8 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.109 2004/05/31 19:32:30 mcbride Exp $ */ +/* $OpenBSD: if_wi.c,v 1.110 2004/06/22 20:48:00 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -126,7 +126,7 @@ u_int32_t widebug = WIDEBUG; #if !defined(lint) && !defined(__OpenBSD__) static const char rcsid[] = - "$OpenBSD: if_wi.c,v 1.109 2004/05/31 19:32:30 mcbride Exp $"; + "$OpenBSD: if_wi.c,v 1.110 2004/06/22 20:48:00 millert Exp $"; #endif /* lint */ #ifdef foo @@ -1519,7 +1519,7 @@ wi_setdef(sc, wreq) case WI_RID_SYMBOL_DIVERSITY: sc->wi_diversity = letoh16(wreq->wi_val[0]); break; - case WI_RID_CNF_ENH_SECURITY: + case WI_RID_ENH_SECURITY: sc->wi_enh_security = letoh16(wreq->wi_val[0]); break; case WI_RID_ENCRYPTION: @@ -1757,7 +1757,7 @@ wi_ioctl(ifp, command, data) case WI_RID_CREATE_IBSS: case WI_RID_MICROWAVE_OVEN: case WI_RID_OWN_SSID: - case WI_RID_CNF_ENH_SECURITY: + case WI_RID_ENH_SECURITY: /* * Check for features that may not be supported * (must be just before default case). @@ -1770,7 +1770,7 @@ wi_ioctl(ifp, command, data) !(sc->wi_flags & WI_FLAGS_HAS_CREATE_IBSS)) || (wreq.wi_type == WI_RID_MICROWAVE_OVEN && !(sc->wi_flags & WI_FLAGS_HAS_MOR)) || - (wreq.wi_type == WI_RID_CNF_ENH_SECURITY && + (wreq.wi_type == WI_RID_ENH_SECURITY && !(sc->wi_flags & WI_FLAGS_HAS_ENH_SECURITY)) || (wreq.wi_type == WI_RID_OWN_SSID && wreq.wi_len != 0)) @@ -1916,7 +1916,7 @@ wi_init_io(sc) /* Set Enhanced Security if supported. */ if (sc->wi_flags & WI_FLAGS_HAS_ENH_SECURITY) - WI_SETVAL(WI_RID_CNF_ENH_SECURITY, sc->wi_enh_security); + WI_SETVAL(WI_RID_ENH_SECURITY, sc->wi_enh_security); /* Set Roaming Mode unless this is a Symbol card. */ if (sc->wi_flags & WI_FLAGS_HAS_ROAMING) diff --git a/sys/dev/ic/if_wi_ieee.h b/sys/dev/ic/if_wi_ieee.h index bceff9eea84..e1181f4dd97 100644 --- a/sys/dev/ic/if_wi_ieee.h +++ b/sys/dev/ic/if_wi_ieee.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wi_ieee.h,v 1.22 2004/03/18 16:16:10 millert Exp $ */ +/* $OpenBSD: if_wi_ieee.h,v 1.23 2004/06/22 20:48:00 millert Exp $ */ /* * Copyright (c) 1997, 1998, 1999 @@ -238,8 +238,8 @@ struct wi_counters { #define WI_RID_SYMBOL_KEYLENGTH 0xFC2B #define WI_RID_ROAMING_MODE 0xFC2D /* Roaming mode (1:firm,3:disable) */ #define WI_RID_CUR_BEACON_INT 0xFC33 /* beacon xmit time for BSS creation */ -#define WI_RID_CNF_ENH_SECURITY 0xFC43 /* hide SSID name (prism fw >= 1.6.3) */ -#define WI_RID_CNF_DBM_ADJUST 0xFC46 /* Get DBM adjustment factor */ +#define WI_RID_ENH_SECURITY 0xFC43 /* hide SSID name (prism fw >= 1.6.3) */ +#define WI_RID_DBM_ADJUST 0xFC46 /* Get DBM adjustment factor */ #define WI_RID_SYMBOL_PREAMBLE 0xFC8C /* Enable/disable short preamble */ #define WI_RID_P2_SHORT_PREAMBLE 0xFCB0 /* Short preamble support */ #define WI_RID_P2_EXCLUDE_LONG_PREAMBLE 0xFCB1 /* Don't send long preamble */ |