diff options
| author | kevlo <kevlo@FreeBSD.org> | 2007-06-29 02:43:13 +0000 |
|---|---|---|
| committer | kevlo <kevlo@FreeBSD.org> | 2007-06-29 02:43:13 +0000 |
| commit | 4f8f7b63aaea072afdf83c9faec421752039cbc6 (patch) | |
| tree | 9ea6e9e1df3e46bb27349c13558f65579facde9c /sys | |
| parent | 6533925808b189b68ae4b9cc04c702bf9e965147 (diff) | |
| download | FreeBSD-src-4f8f7b63aaea072afdf83c9faec421752039cbc6.zip FreeBSD-src-4f8f7b63aaea072afdf83c9faec421752039cbc6.tar.gz | |
Don't use 64-byte header on each packet in radiotap.
Reviewed by: sam
Approved by: re(bmah)
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ipw/if_ipw.c | 7 | ||||
| -rw-r--r-- | sys/dev/ral/rt2560.c | 7 | ||||
| -rw-r--r-- | sys/dev/ral/rt2661.c | 7 |
3 files changed, 12 insertions, 9 deletions
diff --git a/sys/dev/ipw/if_ipw.c b/sys/dev/ipw/if_ipw.c index 2dca3cd..0f412db 100644 --- a/sys/dev/ipw/if_ipw.c +++ b/sys/dev/ipw/if_ipw.c @@ -312,13 +312,14 @@ ipw_attach(device_t dev) ieee80211_media_init(ic, ipw_media_change, ipw_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(IPW_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(IPW_TX_RADIOTAP_PRESENT); diff --git a/sys/dev/ral/rt2560.c b/sys/dev/ral/rt2560.c index f09c4f3..191a459 100644 --- a/sys/dev/ral/rt2560.c +++ b/sys/dev/ral/rt2560.c @@ -304,13 +304,14 @@ rt2560_attach(device_t dev, int id) ieee80211_media_init(ic, rt2560_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2560_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(RT2560_TX_RADIOTAP_PRESENT); diff --git a/sys/dev/ral/rt2661.c b/sys/dev/ral/rt2661.c index 224da32..e06b1be 100644 --- a/sys/dev/ral/rt2661.c +++ b/sys/dev/ral/rt2661.c @@ -332,13 +332,14 @@ rt2661_attach(device_t dev, int id) ieee80211_media_init(ic, rt2661_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2661_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(RT2661_TX_RADIOTAP_PRESENT); |
