From e77902181c85bbb5183c598741da75e0d5a17967 Mon Sep 17 00:00:00 2001
From: Peter Wemm <peter@FreeBSD.org>
Date: Wed, 8 Jul 1998 01:24:37 +0000
Subject: [PATCH] Merge changes from vendor branch.

---
 sys/dev/de/if_de.c | 13 +++++++++++--
 sys/pci/if_de.c    | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c
index 6e755d85955..e0a128e2489 100644
--- a/sys/dev/de/if_de.c
+++ b/sys/dev/de/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;
diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c
index 6e755d85955..e0a128e2489 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;