Deleted Added
full compact
if_de.c (48528) if_de.c (48645)
1/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
1/* $NetBSD: if_de.c,v 1.82 1999/02/28 17:08:51 explorer Exp $ */
2/* $Id: if_de.c,v 1.106 1999/05/10 14:12:26 peter Exp $ */
2/* $Id: if_de.c,v 1.107 1999/07/03 20:17:02 peter Exp $ */
3
4/*-
5 * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

--- 77 unchanged lines hidden (view full) ---

88#include <net/netisr.h>
89#endif
90
91#if defined(__bsdi__) && _BSDI_VERSION >= 199701
92#include <dev/mii/mii.h>
93#include <dev/mii/miivar.h>
94#endif
95
3
4/*-
5 * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
6 * All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions
10 * are met:

--- 77 unchanged lines hidden (view full) ---

88#include <net/netisr.h>
89#endif
90
91#if defined(__bsdi__) && _BSDI_VERSION >= 199701
92#include <dev/mii/mii.h>
93#include <dev/mii/miivar.h>
94#endif
95
96#include "bpfilter.h"
97#if NBPFILTER > 0
96#include "bpf.h"
97#if NBPF > 0
98#include <net/bpf.h>
99#endif
100
101#ifdef INET
102#include <netinet/in.h>
103#include <netinet/if_ether.h>
104#endif
105

--- 3425 unchanged lines hidden (view full) ---

3531 bus_dmamap_unload(sc->tulip_dmatag, map);
3532 sc->tulip_rxmaps[sc->tulip_rxmaps_free++] = map;
3533#if defined(DIAGNOSTIC)
3534 M_SETCTX(me, NULL);
3535#endif
3536#endif /* TULIP_BUS_DMA */
3537
3538 eh = *mtod(ms, struct ether_header *);
98#include <net/bpf.h>
99#endif
100
101#ifdef INET
102#include <netinet/in.h>
103#include <netinet/if_ether.h>
104#endif
105

--- 3425 unchanged lines hidden (view full) ---

3531 bus_dmamap_unload(sc->tulip_dmatag, map);
3532 sc->tulip_rxmaps[sc->tulip_rxmaps_free++] = map;
3533#if defined(DIAGNOSTIC)
3534 M_SETCTX(me, NULL);
3535#endif
3536#endif /* TULIP_BUS_DMA */
3537
3538 eh = *mtod(ms, struct ether_header *);
3539#if NBPFILTER > 0
3539#if NBPF > 0
3540 if (sc->tulip_bpf != NULL) {
3541 if (me == ms)
3542 TULIP_BPF_TAP(sc, mtod(ms, caddr_t), total_len);
3543 else
3544 TULIP_BPF_MTAP(sc, ms);
3545 }
3546#endif
3547 sc->tulip_flags |= TULIP_RXACT;

--- 254 unchanged lines hidden (view full) ---

3802 const u_int32_t d_status = ri->ri_nextin->d_status;
3803 IF_DEQUEUE(&sc->tulip_txq, m);
3804 if (m != NULL) {
3805#if defined(TULIP_BUS_DMA) && !defined(TULIP_BUS_DMA_NOTX)
3806 bus_dmamap_t map = M_GETCTX(m, bus_dmamap_t);
3807 TULIP_TXMAP_POSTSYNC(sc, map);
3808 sc->tulip_txmaps[sc->tulip_txmaps_free++] = map;
3809#endif /* TULIP_BUS_DMA */
3540 if (sc->tulip_bpf != NULL) {
3541 if (me == ms)
3542 TULIP_BPF_TAP(sc, mtod(ms, caddr_t), total_len);
3543 else
3544 TULIP_BPF_MTAP(sc, ms);
3545 }
3546#endif
3547 sc->tulip_flags |= TULIP_RXACT;

--- 254 unchanged lines hidden (view full) ---

3802 const u_int32_t d_status = ri->ri_nextin->d_status;
3803 IF_DEQUEUE(&sc->tulip_txq, m);
3804 if (m != NULL) {
3805#if defined(TULIP_BUS_DMA) && !defined(TULIP_BUS_DMA_NOTX)
3806 bus_dmamap_t map = M_GETCTX(m, bus_dmamap_t);
3807 TULIP_TXMAP_POSTSYNC(sc, map);
3808 sc->tulip_txmaps[sc->tulip_txmaps_free++] = map;
3809#endif /* TULIP_BUS_DMA */
3810#if NBPFILTER > 0
3810#if NBPF > 0
3811 if (sc->tulip_bpf != NULL)
3812 TULIP_BPF_MTAP(sc, m);
3813#endif
3814 m_freem(m);
3815#if defined(TULIP_DEBUG)
3816 } else {
3817 printf(TULIP_PRINTF_FMT ": tx_intr: failed to dequeue mbuf?!?\n", TULIP_PRINTF_ARGS);
3818#endif

--- 1288 unchanged lines hidden (view full) ---

5107#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
5108 ifp->if_snd.ifq_maxlen = ifqmaxlen;
5109#endif
5110#if defined(__NetBSD__) || (defined(__FreeBSD__) && BSD >= 199506)
5111 TULIP_ETHER_IFATTACH(sc);
5112#endif
5113#endif /* __bsdi__ */
5114
3811 if (sc->tulip_bpf != NULL)
3812 TULIP_BPF_MTAP(sc, m);
3813#endif
3814 m_freem(m);
3815#if defined(TULIP_DEBUG)
3816 } else {
3817 printf(TULIP_PRINTF_FMT ": tx_intr: failed to dequeue mbuf?!?\n", TULIP_PRINTF_ARGS);
3818#endif

--- 1288 unchanged lines hidden (view full) ---

5107#if defined(__FreeBSD__) && __FreeBSD_version >= 300000
5108 ifp->if_snd.ifq_maxlen = ifqmaxlen;
5109#endif
5110#if defined(__NetBSD__) || (defined(__FreeBSD__) && BSD >= 199506)
5111 TULIP_ETHER_IFATTACH(sc);
5112#endif
5113#endif /* __bsdi__ */
5114
5115#if NBPFILTER > 0
5115#if NBPF > 0
5116 TULIP_BPF_ATTACH(sc);
5117#endif
5118
5119#if defined(__NetBSD__) && NRND > 0
5120 rnd_attach_source(&sc->tulip_rndsource, sc->tulip_dev.dv_xname,
5121 RND_TYPE_NET, 0);
5122#endif
5123}

--- 798 unchanged lines hidden ---
5116 TULIP_BPF_ATTACH(sc);
5117#endif
5118
5119#if defined(__NetBSD__) && NRND > 0
5120 rnd_attach_source(&sc->tulip_rndsource, sc->tulip_dev.dv_xname,
5121 RND_TYPE_NET, 0);
5122#endif
5123}

--- 798 unchanged lines hidden ---