diff options
| author | mdodd <mdodd@FreeBSD.org> | 2003-03-16 00:24:18 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 2003-03-16 00:24:18 +0000 |
| commit | 3e893afaf8c7546ef14459b3f6c805dafdf774ad (patch) | |
| tree | fc865aa5b37fa6e3c1e069041f805e642006cd57 | |
| parent | 41e5cea4996d19999044c79f425bc54395d7e396 (diff) | |
| download | FreeBSD-src-3e893afaf8c7546ef14459b3f6c805dafdf774ad.zip FreeBSD-src-3e893afaf8c7546ef14459b3f6c805dafdf774ad.tar.gz | |
Catch up with recent infrastructure changes.
| -rw-r--r-- | sys/contrib/dev/oltr/if_oltr.c | 5 | ||||
| -rw-r--r-- | sys/dev/pdq/pdq_ifsubr.c | 4 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/contrib/dev/oltr/if_oltr.c b/sys/contrib/dev/oltr/if_oltr.c index 364d49a..91f906b 100644 --- a/sys/contrib/dev/oltr/if_oltr.c +++ b/sys/contrib/dev/oltr/if_oltr.c @@ -666,10 +666,6 @@ oltr_pci_attach(pcici_t config_id, int unit) ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; iso88025_ifattach(ifp); -#if (NBPFILTER > 0) || (__FreeBSD_version > 400000) - bpfattach(ifp, DLT_IEEE802, sizeof(struct iso88025_header)); -#endif - splx(s); return; @@ -1464,7 +1460,6 @@ DriverReceiveFrameCompleted(void *DriverHandle, int ByteCount, int FragmentCount } ifp->if_ipackets++; - BPF_MTAP(ifp, m0); iso88025_input(ifp, m0); } else { /* Receiver error */ if (ReceiveStatus != TRLLD_RCV_NO_DATA) { diff --git a/sys/dev/pdq/pdq_ifsubr.c b/sys/dev/pdq/pdq_ifsubr.c index 064bb68..2b29f43 100644 --- a/sys/dev/pdq/pdq_ifsubr.c +++ b/sys/dev/pdq/pdq_ifsubr.c @@ -212,7 +212,7 @@ pdq_os_receive_pdu( } #endif m->m_pkthdr.len = pktlen; -#if NBPFILTER > 0 +#if NBPFILTER > 0 && defined(__NetBSD__) if (sc->sc_bpf != NULL) PDQ_BPF_MTAP(sc, m); #endif @@ -456,8 +456,8 @@ pdq_ifattach(pdq_softc_t *sc) } #endif - if_attach(ifp); #if defined(__NetBSD__) + if_attach(ifp); fddi_ifattach(ifp, (caddr_t)&sc->sc_pdq->pdq_hwaddr); #else fddi_ifattach(ifp, FDDI_BPF_SUPPORTED); |
