diff options
| author | peter <peter@FreeBSD.org> | 1998-07-08 01:16:05 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1998-07-08 01:16:05 +0000 |
| commit | 0e12902b839e7a244c0b5e6f66802b5491219cb4 (patch) | |
| tree | 310ce7ff6277d202ca6a115e93a3906dee07cdc7 /sys | |
| parent | a3015b6faaa0240b45b92fa289b5e9dcb2b66f9d (diff) | |
| download | FreeBSD-src-0e12902b839e7a244c0b5e6f66802b5491219cb4.zip FreeBSD-src-0e12902b839e7a244c0b5e6f66802b5491219cb4.tar.gz | |
Import NetBSD-current version of if_de driver onto vendor branch.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pci/if_de.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index a8d8ea8..c988551 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -1,4 +1,4 @@ -/* $NetBSD: if_de.c,v 1.69 1998/06/08 06:55:55 thorpej Exp $ */ +/* $NetBSD: if_de.c,v 1.72 1998/07/05 06:49:14 jonathan Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -38,6 +38,11 @@ */ #define TULIP_HDR_DATA +#ifdef __NetBSD__ +#include "opt_inet.h" +#include "opt_ns.h" +#endif + #include <sys/param.h> #include <sys/systm.h> #include <sys/mbuf.h> @@ -4447,11 +4452,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; |
