diff options
| author | imp <imp@FreeBSD.org> | 2002-05-31 03:27:34 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2002-05-31 03:27:34 +0000 |
| commit | cf0d37c01ce3cca726bdc3c525f3a38918b47b33 (patch) | |
| tree | db47fd734097c8d1fd65c762503f41d49b34254f /sys/dev/awi | |
| parent | 331e9d77d6adad7f06d711dcf6dd6f919173a386 (diff) | |
| download | FreeBSD-src-cf0d37c01ce3cca726bdc3c525f3a38918b47b33.zip FreeBSD-src-cf0d37c01ce3cca726bdc3c525f3a38918b47b33.tar.gz | |
Use __FreeBSD_version to test what things to use
Diffstat (limited to 'sys/dev/awi')
| -rw-r--r-- | sys/dev/awi/awi.c | 19 | ||||
| -rw-r--r-- | sys/dev/awi/awivar.h | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c index 0ab059a..0fdff7c 100644 --- a/sys/dev/awi/awi.c +++ b/sys/dev/awi/awi.c @@ -86,14 +86,6 @@ */ #include "opt_inet.h" -#if defined(__FreeBSD__) && __FreeBSD__ >= 4 -#define NBPFILTER 1 -#elif defined(__FreeBSD__) && __FreeBSD__ >= 3 -#include "bpf.h" -#define NBPFILTER NBPF -#else -#include "bpfilter.h" -#endif #include <sys/param.h> #include <sys/systm.h> @@ -134,6 +126,15 @@ #endif #endif +#if defined(__FreeBSD__) && __FreeBSD_version >= 400000 +#define NBPFILTER 1 +#elif defined(__FreeBSD__) && __FreeBSD_version >= 300000 +#include "bpf.h" +#define NBPFILTER NBPF +#else +#include "bpfilter.h" +#endif + #if NBPFILTER > 0 #include <net/bpf.h> #include <net/bpfdesc.h> @@ -464,7 +465,7 @@ awi_ioctl(ifp, cmd, data) u_int8_t tmpstr[IEEE80211_NWID_LEN*2]; #ifdef __FreeBSD_version #if __FreeBSD_version < 500028 - struct proc *mythread = curproc; /* Little lie */ + struct proc *mythread = curproc; /* name a white lie */ #else struct thread *mythread = curthread; #endif diff --git a/sys/dev/awi/awivar.h b/sys/dev/awi/awivar.h index a55b6a7..0d4a979 100644 --- a/sys/dev/awi/awivar.h +++ b/sys/dev/awi/awivar.h @@ -95,7 +95,7 @@ struct awi_softc void *sc_ih; /* interrupt handler */ #endif #ifdef __FreeBSD__ -#if __FreeBSD__ >= 4 +#if __FreeBSD_version >= 40000 struct { char dv_xname[64]; /*XXX*/ } sc_dev; |
