aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1998-07-08 01:16:05 +0000
committerPeter Wemm <peter@FreeBSD.org>1998-07-08 01:16:05 +0000
commit7a9d7897458e4bdbbd3562af0b0471059a7e3c06 (patch)
tree3a82963f32a5234b752c6975135f12af5d95662d
parenta6448694b7a22d7c849e6b09f92110aa4940d08a (diff)
Import NetBSD-current version of if_de driver onto vendor branch.
Notes
Notes: svn path=/vendor/NetBSD/dist/; revision=37491
-rw-r--r--sys/pci/if_de.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index a8d8ea83ee02..c9885517c434 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;