diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-24 21:44:33 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-01-24 21:44:33 +0000 |
| commit | c142705ae969670aaf44dbbd65f6dbc5b126b695 (patch) | |
| tree | ec570110a2b13e47f1090c207ffb2940b3c2e3d8 | |
| parent | 9079e8303c345d7c4aa2ca6674a246c9d71b420e (diff) | |
We don't report the antenna in the bpf tap. Remove it.
| -rw-r--r-- | sys/dev/usb/if_upgt.c | 4 | ||||
| -rw-r--r-- | sys/dev/usb/if_upgtvar.h | 8 |
2 files changed, 3 insertions, 9 deletions
diff --git a/sys/dev/usb/if_upgt.c b/sys/dev/usb/if_upgt.c index 467aa685403..068eec49b8d 100644 --- a/sys/dev/usb/if_upgt.c +++ b/sys/dev/usb/if_upgt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgt.c,v 1.28 2008/01/24 21:24:05 mglocker Exp $ */ +/* $OpenBSD: if_upgt.c,v 1.29 2008/01/24 21:44:32 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -1540,7 +1540,6 @@ upgt_tx_task(void *arg) htole16(ic->ic_bss->ni_chan->ic_freq); tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags); - tap->wt_antenna = 0; mb.m_data = (caddr_t)tap; mb.m_len = sc->sc_txtap_len; @@ -1753,7 +1752,6 @@ upgt_rx(struct upgt_softc *sc, uint8_t *data, int pkglen) tap->wr_rate = upgt_rx_rate(sc, rxdesc->rate); tap->wr_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq); tap->wr_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags); - tap->wr_antenna = 0; tap->wr_antsignal = rxdesc->rssi; mb.m_data = (caddr_t)tap; diff --git a/sys/dev/usb/if_upgtvar.h b/sys/dev/usb/if_upgtvar.h index 744131370dd..38d749bb5c1 100644 --- a/sys/dev/usb/if_upgtvar.h +++ b/sys/dev/usb/if_upgtvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_upgtvar.h,v 1.11 2008/01/21 19:37:36 mglocker Exp $ */ +/* $OpenBSD: if_upgtvar.h,v 1.12 2008/01/24 21:44:32 mglocker Exp $ */ /* * Copyright (c) 2007 Marcus Glocker <mglocker@openbsd.org> @@ -27,7 +27,6 @@ struct upgt_rx_radiotap_header { uint8_t wr_rate; uint16_t wr_chan_freq; uint16_t wr_chan_flags; - uint8_t wr_antenna; uint8_t wr_antsignal; } __packed; @@ -35,7 +34,6 @@ struct upgt_rx_radiotap_header { ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_ANTENNA) | \ (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL)) struct upgt_tx_radiotap_header { @@ -44,14 +42,12 @@ struct upgt_tx_radiotap_header { uint8_t wt_rate; uint16_t wt_chan_freq; uint16_t wt_chan_flags; - uint8_t wt_antenna; } __packed; #define UPGT_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ (1 << IEEE80211_RADIOTAP_RATE) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL) | \ - (1 << IEEE80211_RADIOTAP_ANTENNA)) + (1 << IEEE80211_RADIOTAP_CHANNEL)) /* * General values. |