diff options
| author | David Gwynne <dlg@cvs.openbsd.org> | 2019-09-30 01:53:06 +0000 |
|---|---|---|
| committer | David Gwynne <dlg@cvs.openbsd.org> | 2019-09-30 01:53:06 +0000 |
| commit | 2e94edf8d3329a76b2efd0b561196b9ca70b3bf8 (patch) | |
| tree | 9a36df6a40732f924746ac29d58b8f008ac70332 /sys/dev | |
| parent | a2ace3df863ed064c9012c07f26dbdae274f782d (diff) | |
remove the "copy function" argument to bpf_mtap_hdr.
it was previously (ab)used by pflog, which has since been fixed.
apart from that nothing else used it, so we can trim the cruft.
ok kn@ claudio@ visa@
visa@ also made sure i fixed ipw(4) so i386 won't break.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/if_ipw.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwi.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwm.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_iwn.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_mcx.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 6 |
6 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/pci/if_ipw.c b/sys/dev/pci/if_ipw.c index b0e8a3e778e..89d0fac49ce 100644 --- a/sys/dev/pci/if_ipw.c +++ b/sys/dev/pci/if_ipw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_ipw.c,v 1.125 2019/09/18 23:52:32 dlg Exp $ */ +/* $OpenBSD: if_ipw.c,v 1.126 2019/09/30 01:53:05 dlg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -887,7 +887,7 @@ ipw_data_intr(struct ipw_softc *sc, struct ipw_status *status, tap->wr_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_rxtap_len, - m, BPF_DIRECTION_IN, NULL); + m, BPF_DIRECTION_IN); } #endif @@ -1157,7 +1157,7 @@ ipw_tx_start(struct ifnet *ifp, struct mbuf *m, struct ieee80211_node *ni) tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_txtap_len, - m, BPF_DIRECTION_OUT, NULL); + m, BPF_DIRECTION_OUT); } #endif diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c index 8b5f9119a60..e7093399642 100644 --- a/sys/dev/pci/if_iwi.c +++ b/sys/dev/pci/if_iwi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwi.c,v 1.142 2019/09/18 23:52:32 dlg Exp $ */ +/* $OpenBSD: if_iwi.c,v 1.143 2019/09/30 01:53:05 dlg Exp $ */ /*- * Copyright (c) 2004-2008 @@ -937,7 +937,7 @@ iwi_frame_intr(struct iwi_softc *sc, struct iwi_rx_data *data, tap->wr_flags |= IEEE80211_RADIOTAP_F_SHORTPRE; bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_rxtap_len, - m, BPF_DIRECTION_IN, NULL); + m, BPF_DIRECTION_IN); } #endif @@ -1268,7 +1268,7 @@ iwi_tx_start(struct ifnet *ifp, struct mbuf *m0, struct ieee80211_node *ni) tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags); bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_txtap_len, - m0, BPF_DIRECTION_OUT, NULL); + m0, BPF_DIRECTION_OUT); } #endif diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c index 1c024bb0bcc..94d4f26f861 100644 --- a/sys/dev/pci/if_iwm.c +++ b/sys/dev/pci/if_iwm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwm.c,v 1.251 2019/09/18 23:52:32 dlg Exp $ */ +/* $OpenBSD: if_iwm.c,v 1.252 2019/09/30 01:53:05 dlg Exp $ */ /* * Copyright (c) 2014, 2016 genua gmbh <info@genua.de> @@ -3555,7 +3555,7 @@ iwm_rx_rx_mpdu(struct iwm_softc *sc, struct iwm_rx_packet *pkt, } bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_rxtap_len, - m, BPF_DIRECTION_IN, NULL); + m, BPF_DIRECTION_IN); } #endif ieee80211_inputm(IC2IFP(ic), m, ni, &rxi, ml); @@ -4262,7 +4262,7 @@ iwm_tx(struct iwm_softc *sc, struct mbuf *m, struct ieee80211_node *ni, int ac) tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP; bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_txtap_len, - m, BPF_DIRECTION_OUT, NULL); + m, BPF_DIRECTION_OUT); } #endif diff --git a/sys/dev/pci/if_iwn.c b/sys/dev/pci/if_iwn.c index e4ca02e0398..e9ca16a6f82 100644 --- a/sys/dev/pci/if_iwn.c +++ b/sys/dev/pci/if_iwn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_iwn.c,v 1.217 2019/09/18 23:52:32 dlg Exp $ */ +/* $OpenBSD: if_iwn.c,v 1.218 2019/09/30 01:53:05 dlg Exp $ */ /*- * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr> @@ -2227,7 +2227,7 @@ iwn_rx_done(struct iwn_softc *sc, struct iwn_rx_desc *desc, } bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_rxtap_len, - m, BPF_DIRECTION_IN, NULL); + m, BPF_DIRECTION_IN); } #endif @@ -3277,7 +3277,7 @@ iwn_tx(struct iwn_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP; bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_txtap_len, - m, BPF_DIRECTION_OUT, NULL); + m, BPF_DIRECTION_OUT); } #endif diff --git a/sys/dev/pci/if_mcx.c b/sys/dev/pci/if_mcx.c index 6c1d6e93d27..90d5e05fef7 100644 --- a/sys/dev/pci/if_mcx.c +++ b/sys/dev/pci/if_mcx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */ +/* $OpenBSD: if_mcx.c,v 1.34 2019/09/30 01:53:05 dlg Exp $ */ /* * Copyright (c) 2017 David Gwynne <dlg@openbsd.org> @@ -6352,7 +6352,7 @@ mcx_start(struct ifqueue *ifq) if (ifp->if_bpf) bpf_mtap_hdr(ifp->if_bpf, (caddr_t)sqe->sqe_inline_headers, - MCX_SQ_INLINE_SIZE, m, BPF_DIRECTION_OUT, NULL); + MCX_SQ_INLINE_SIZE, m, BPF_DIRECTION_OUT); #endif map = ms->ms_map; bus_dmamap_sync(sc->sc_dmat, map, 0, map->dm_mapsize, diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index cbf2b816a62..23514161af1 100644 --- a/sys/dev/pci/if_wpi.c +++ b/sys/dev/pci/if_wpi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpi.c,v 1.148 2019/09/18 23:52:32 dlg Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.149 2019/09/30 01:53:05 dlg Exp $ */ /*- * Copyright (c) 2006-2008 @@ -1331,7 +1331,7 @@ wpi_rx_done(struct wpi_softc *sc, struct wpi_rx_desc *desc, } bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_rxtap_len, - m, BPF_DIRECTION_IN, NULL); + m, BPF_DIRECTION_IN); } #endif @@ -1711,7 +1711,7 @@ wpi_tx(struct wpi_softc *sc, struct mbuf *m, struct ieee80211_node *ni) tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP; bpf_mtap_hdr(sc->sc_drvbpf, tap, sc->sc_txtap_len, - m, BPF_DIRECTION_OUT, NULL); + m, BPF_DIRECTION_OUT); } #endif |