diff options
| author | peter <peter@FreeBSD.org> | 1998-07-08 01:24:37 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-07-08 01:24:37 +0000 |
| commit | 397a367a3ecff8cf99508842bcd945095408dd52 (patch) | |
| tree | 1cdcdedcb24c9577ea129c0b0a948e32e609abde /sys/pci | |
| parent | 78a155ddaf49598651f8b5c0d320e4f5d2b49ee3 (diff) | |
| download | FreeBSD-src-397a367a3ecff8cf99508842bcd945095408dd52.zip FreeBSD-src-397a367a3ecff8cf99508842bcd945095408dd52.tar.gz | |
Merge changes from vendor branch.
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/if_de.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 6e755d8..e0a128e 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -1,5 +1,5 @@ -/* $NetBSD: if_de.c,v 1.69 1998/06/08 06:55:55 thorpej Exp $ */ -/* $Id: if_de.c,v 1.82 1998/03/08 16:53:54 peter Exp $ */ +/* $NetBSD: if_de.c,v 1.72 1998/07/05 06:49:14 jonathan Exp $ */ +/* $Id: if_de.c,v 1.83 1998/06/13 17:19:59 peter Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -39,8 +39,15 @@ */ #define TULIP_HDR_DATA +#ifdef __FreeBSD__ #include "opt_inet.h" #include "opt_ipx.h" +#endif + +#ifdef __NetBSD__ +#include "opt_inet.h" +#include "opt_ns.h" +#endif #include <sys/param.h> #include <sys/systm.h> @@ -4492,11 +4499,13 @@ tulip_txput( sc->tulip_intrmask |= TULIP_STS_TXINTR; TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask); } +#if 0 /* this isn't working right yet */ } else if ((sc->tulip_flags & TULIP_PROMISC) == 0) { if (sc->tulip_intrmask & TULIP_STS_TXINTR) { sc->tulip_intrmask &= ~TULIP_STS_TXINTR; TULIP_CSR_WRITE(sc, csr_intr, sc->tulip_intrmask); } +#endif } TULIP_PERFEND(txput); return m; |
