upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from vendor branch.

Browse source
This commit is contained in:
Peter Wemm 1998-07-08 01:24:37 +00:00
parent 6deaf84b1f
commit e77902181c
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sys/dev/de/if_de.c
View file

@ -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;

13
sys/pci/if_de.c
View file

@ -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;