commit ba5cb31a9615a98f2314b5b779b4186d11b2949e Author: Ryota Ozaki Date: Wed Dec 7 13:25:27 2016 +0900 Annotate bpf_mtap running in hardintr with "XXX not in softint" diff --git a/sys/dev/ic/hd64570.c b/sys/dev/ic/hd64570.c index 359b03f..a424c5e 100644 --- a/sys/dev/ic/hd64570.c +++ b/sys/dev/ic/hd64570.c @@ -1574,7 +1574,7 @@ sca_frame_process(sca_port_t *scp) return; } - bpf_mtap(&scp->sp_if, m); + bpf_mtap(&scp->sp_if, m); /* XXX not in softint */ scp->sp_if.if_ipackets++; diff --git a/sys/dev/ic/midway.c b/sys/dev/ic/midway.c index 83bf0f1..9c6256e 100644 --- a/sys/dev/ic/midway.c +++ b/sys/dev/ic/midway.c @@ -2766,7 +2766,7 @@ EN_INTR_TYPE en_intr(void *arg) ifp->if_ipackets++; #endif - bpf_mtap(ifp, m); + bpf_mtap(ifp, m); /* XXX not in softint */ atm_input(ifp, &ah, m, sc->rxslot[slot].rxhand); } diff --git a/sys/dev/pci/if_lmc.c b/sys/dev/pci/if_lmc.c index a40fb80..e85d6df 100644 --- a/sys/dev/pci/if_lmc.c +++ b/sys/dev/pci/if_lmc.c @@ -4294,7 +4294,7 @@ rxintr_cleanup(softc_t *sc) sc->status.cntrs.ipackets++; /* Berkeley Packet Filter */ - LMC_BPF_MTAP(sc, first_mbuf); + LMC_BPF_MTAP(sc, first_mbuf); /* XXX not in softint */ /* Give this good packet to the network stacks. */ sc->quota--; @@ -4446,7 +4446,7 @@ txintr_cleanup(softc_t *sc) sc->status.cntrs.opackets++; /* Berkeley Packet Filter */ - LMC_BPF_MTAP(sc, m); + LMC_BPF_MTAP(sc, m); /* XXX not in softint */ } m_freem(m); diff --git a/sys/netisdn/i4b_ipr.c b/sys/netisdn/i4b_ipr.c index 9d9d0da..bdda8dd 100644 --- a/sys/netisdn/i4b_ipr.c +++ b/sys/netisdn/i4b_ipr.c @@ -1070,7 +1070,7 @@ error: mm.m_len = 4; mm.m_data = (char *)⁡ - bpf_mtap(&sc->sc_if, &mm); + bpf_mtap(&sc->sc_if, &mm); /* XXX not in softint */ } #endif /* NBPFILTER > 0 || NBPF > 0 */