Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use bpf_mtap2().

This commit is contained in:
dyoung 2007-09-01 07:34:03 +00:00
parent dcd8923429
commit 5384cb3ee5
1 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/dev/ic/rt2560.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rt2560.c,v 1.11 2007/09/01 07:32:28 dyoung Exp $ */ /* $NetBSD: rt2560.c,v 1.12 2007/09/01 07:34:03 dyoung Exp $ */
/* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */ /* $OpenBSD: rt2560.c,v 1.15 2006/04/20 20:31:12 miod Exp $ */
/* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/ /* $FreeBSD: rt2560.c,v 1.3 2006/03/21 21:15:43 damien Exp $*/
@ -24,7 +24,7 @@
* http://www.ralinktech.com/ * http://www.ralinktech.com/
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.11 2007/09/01 07:32:28 dyoung Exp $"); __KERNEL_RCSID(0, "$NetBSD: rt2560.c,v 1.12 2007/09/01 07:34:03 dyoung Exp $");
#include "bpfilter.h" #include "bpfilter.h"
@ -1346,7 +1346,6 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
#if NBPFILTER > 0 #if NBPFILTER > 0
if (sc->sc_drvbpf != NULL) { if (sc->sc_drvbpf != NULL) {
struct mbuf mb;
struct rt2560_rx_radiotap_header *tap = &sc->sc_rxtap; struct rt2560_rx_radiotap_header *tap = &sc->sc_rxtap;
uint32_t tsf_lo, tsf_hi; uint32_t tsf_lo, tsf_hi;
@ -1364,12 +1363,7 @@ rt2560_decryption_intr(struct rt2560_softc *sc)
tap->wr_antenna = sc->rx_ant; tap->wr_antenna = sc->rx_ant;
tap->wr_antsignal = desc->rssi; tap->wr_antsignal = desc->rssi;
M_COPY_PKTHDR(&mb, m); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m);
mb.m_data = (void *)tap;
mb.m_len = sc->sc_txtap_len;
mb.m_next = m;
mb.m_pkthdr.len += mb.m_len;
bpf_mtap(sc->sc_drvbpf, &mb);
} }
#endif #endif
@ -1820,7 +1814,6 @@ rt2560_tx_mgt(struct rt2560_softc *sc, struct mbuf *m0,
#if NBPFILTER > 0 #if NBPFILTER > 0
if (sc->sc_drvbpf != NULL) { if (sc->sc_drvbpf != NULL) {
struct mbuf mb;
struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap;
tap->wt_flags = 0; tap->wt_flags = 0;
@ -1829,12 +1822,7 @@ rt2560_tx_mgt(struct rt2560_softc *sc, struct mbuf *m0,
tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags);
tap->wt_antenna = sc->tx_ant; tap->wt_antenna = sc->tx_ant;
M_COPY_PKTHDR(&mb, m0); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0);
mb.m_data = (void *)tap;
mb.m_len = sc->sc_txtap_len;
mb.m_next = m0;
mb.m_pkthdr.len += mb.m_len;
bpf_mtap(sc->sc_drvbpf, &mb);
} }
#endif #endif
@ -2064,7 +2052,6 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0,
#if NBPFILTER > 0 #if NBPFILTER > 0
if (sc->sc_drvbpf != NULL) { if (sc->sc_drvbpf != NULL) {
struct mbuf mb;
struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap; struct rt2560_tx_radiotap_header *tap = &sc->sc_txtap;
tap->wt_flags = 0; tap->wt_flags = 0;
@ -2073,13 +2060,7 @@ rt2560_tx_data(struct rt2560_softc *sc, struct mbuf *m0,
tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags);
tap->wt_antenna = sc->tx_ant; tap->wt_antenna = sc->tx_ant;
M_COPY_PKTHDR(&mb, m0); bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m0);
mb.m_data = (void *)tap;
mb.m_len = sc->sc_txtap_len;
mb.m_next = m0;
mb.m_pkthdr.len += mb.m_len;
bpf_mtap(sc->sc_drvbpf, &mb);
} }
#endif #endif