summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2001-10-24 16:20:21 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2001-10-24 16:20:21 +0000
commitbc918138488d9f4c27e694d2a7746763a81f4f51 (patch)
treea5ff5b8f610768b027534a21671b10826afe34e4 /sys
parent73d1b57710cbb2030d4f8bb3266d4af0423cfd2a (diff)
do not #ifdef ANCACHE stuff makes softc constant; pointed out by dima@m3d.dhs.org; fix by me
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/ic/anvar.h13
1 files changed, 4 insertions, 9 deletions
diff --git a/sys/dev/ic/anvar.h b/sys/dev/ic/anvar.h
index f8549a6bc25..627015b17f3 100644
--- a/sys/dev/ic/anvar.h
+++ b/sys/dev/ic/anvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: anvar.h,v 1.5 2001/09/29 21:54:00 mickey Exp $ */
+/* $OpenBSD: anvar.h,v 1.6 2001/10/24 16:20:20 mickey Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -90,10 +90,8 @@ struct an_req {
*/
#define AN_RID_IFACE_STATS 0x0100
#define AN_RID_MGMT_XMIT 0x0200
-#ifdef ANCACHE
#define AN_RID_ZERO_CACHE 0x0300
#define AN_RID_READ_CACHE 0x0400
-#endif
struct an_80211_hdr {
u_int16_t frame_ctl;
@@ -151,7 +149,6 @@ struct an_mgmt_hdr {
*
* Each entry in the wi_sigcache has a unique macsrc.
*/
-#ifdef ANCACHE
#define MAXANCACHE 10
struct an_sigcache {
@@ -161,7 +158,6 @@ struct an_sigcache {
int noise; /* noise value */
int quality; /* quality of the packet */
};
-#endif
struct an_ltv_key {
u_int16_t an_len;
@@ -647,6 +643,7 @@ struct an_softc {
struct arpcom arpcom;
struct ifmedia an_ifmedia;
void *sc_ih;
+ struct timeout an_stat_ch;
bus_space_tag_t an_btag;
bus_space_handle_t an_bhandle;
@@ -664,15 +661,13 @@ struct an_softc {
struct an_ltv_stats an_stats;
struct an_ltv_status an_status;
u_int8_t an_associated;
-#ifdef ANCACHE
+
+ /* ANCACHE stuff */
int an_cache_iponly;
int an_cache_mcastonly;
-
int an_sigitems;
struct an_sigcache an_sigcache[MAXANCACHE];
int an_nextitem;
-#endif
- struct timeout an_stat_ch;
};
void an_release_resources __P((struct device *));