From 55834910446855390efe409f1cf135e191aa0f40 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 29 Dec 2006 16:38:22 +0000 Subject: [PATCH] Fix fat-fingering in previous commit. Pointy hat to: jhb --- sys/dev/en/midway.c | 2 +- sys/dev/my/if_my.c | 2 +- sys/dev/ppbus/if_plip.c | 2 +- sys/i4b/driver/i4b_ipr.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/dev/en/midway.c b/sys/dev/en/midway.c index 673219031f63..85e4a807d995 100644 --- a/sys/dev/en/midway.c +++ b/sys/dev/en/midway.c @@ -794,7 +794,7 @@ en_txdma(struct en_softc *sc, struct en_txslot *slot) tx.m->m_pkthdr.len = tx.datalen; } - bpf_mtap(sc->ifp, tx.m); + bpf_mtap(sc->ifp->if_bpf, tx.m); } #endif diff --git a/sys/dev/my/if_my.c b/sys/dev/my/if_my.c index 0e9d106bbc42..b17751cc08ec 100644 --- a/sys/dev/my/if_my.c +++ b/sys/dev/my/if_my.c @@ -1162,7 +1162,7 @@ my_rxeof(struct my_softc * sc) * address or the interface is in promiscuous mode. */ if (bpf_peers_present(ifp->if_bpf)) { - bpf_mtap(ifp, m); + bpf_mtap(ifp->if_bpf, m); if (ifp->if_flags & IFF_PROMISC && (bcmp(eh->ether_dhost, IF_LLADDR(sc->my_ifp), ETHER_ADDR_LEN) && diff --git a/sys/dev/ppbus/if_plip.c b/sys/dev/ppbus/if_plip.c index df59f1bda7d2..7d94eea42fbf 100644 --- a/sys/dev/ppbus/if_plip.c +++ b/sys/dev/ppbus/if_plip.c @@ -455,7 +455,7 @@ static void lptap(struct ifnet *ifp, struct mbuf *m) { u_int32_t af = AF_INET; - bpf_mtap2(ifp, &af, sizeof(af), m); + bpf_mtap2(ifp->if_bpf, &af, sizeof(af), m); } static void diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c index c90e484b11e1..0d90b8a3d5e6 100644 --- a/sys/i4b/driver/i4b_ipr.c +++ b/sys/i4b/driver/i4b_ipr.c @@ -891,7 +891,7 @@ ipr_rx_data_rdy(int unit) mm.m_next = m; mm.m_len = 4; mm.m_data = (char *)⁡ - bpf_mtap(sc->sc_ifp, &mm); + bpf_mtap(sc->sc_ifp->if_bpf, &mm); } if(netisr_queue(NETISR_IP, m)) /* (0) on success. */ @@ -945,7 +945,7 @@ ipr_tx_queue_empty(int unit) mm.m_next = m; mm.m_len = 4; mm.m_data = (char *)⁡ - bpf_mtap(sc->sc_ifp, &mm); + bpf_mtap(sc->sc_ifp->if_bpf, &mm); } #if I4BIPRACCT