From 9e078d739492c499203846f618deb861d5bf8a17 Mon Sep 17 00:00:00 2001 From: cgd Date: Tue, 23 Nov 1993 04:51:25 +0000 Subject: [PATCH] defines change --- sys/net/bpf.c | 10 +++------- sys/net/bpfdesc.h | 4 ++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index addae614e2a4..411dffb0b5d3 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -36,17 +36,13 @@ * SUCH DAMAGE. * * from: @(#)bpf.c 7.5 (Berkeley) 7/15/91 - * $Id: bpf.c,v 1.6 1993/11/15 09:56:46 deraadt Exp $ + * $Id: bpf.c,v 1.7 1993/11/23 04:51:25 cgd Exp $ */ #include "bpfilter.h" #if NBPFILTER > 0 -#ifndef __386BSD__ -#define __386BSD__ -#endif - #include #include #include @@ -477,7 +473,7 @@ bpf_wakeup(d) register struct bpf_d *d; { wakeup((caddr_t)d); -#if (BSD > 199103) || defined(__386BSD__) +#if (BSD > 199103) || defined(__NetBSD__) selwakeup(&d->bd_sel); /* XXX */ d->bd_sel.si_pid = 0; @@ -950,7 +946,7 @@ bpf_select(dev, rw, p) splx(s); return (1); } -#if defined(__386BSD__) +#if defined(__NetBSD__) selrecord(p, &d->bd_sel); #else /* diff --git a/sys/net/bpfdesc.h b/sys/net/bpfdesc.h index 0c0c8595b04e..f6108d9cc087 100644 --- a/sys/net/bpfdesc.h +++ b/sys/net/bpfdesc.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)bpfdesc.h 7.1 (Berkeley) 5/7/91 - * $Id: bpfdesc.h,v 1.6 1993/09/09 09:43:18 davidg Exp $ + * $Id: bpfdesc.h,v 1.7 1993/11/23 04:51:29 cgd Exp $ */ #ifndef _NET_BPFDESC_H_ @@ -75,7 +75,7 @@ struct bpf_d { u_char bd_promisc; /* true if listening promiscuously */ u_char bd_state; /* idle, waiting, or timed out */ u_char bd_immediate; /* true to return on packet arrival */ -#if (BSD <= 199103) && !defined(__386BSD__) +#if (BSD <= 199103) && !defined(__NetBSD__) u_char bd_selcoll; /* true if selects collide */ int bd_timedout; struct proc * bd_selproc; /* process that last selected us */