diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-20 15:46:56 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2006-05-20 15:46:56 +0000 |
| commit | 5d18177ac26e330840db323841ef906338323285 (patch) | |
| tree | cd1a60432050674b87575e9a9b2043014ad2b975 | |
| parent | c0545adc745fedf02c6044f964a9b60def01411a (diff) | |
more radiotap.
| -rw-r--r-- | sys/dev/pci/if_wpi.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/if_wpivar.h | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/sys/dev/pci/if_wpi.c b/sys/dev/pci/if_wpi.c index 5b8980b6bd9..c28c8646115 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.11 2006/05/20 15:31:30 damien Exp $ */ +/* $OpenBSD: if_wpi.c,v 1.12 2006/05/20 15:46:55 damien Exp $ */ /*- * Copyright (c) 2006 @@ -1359,6 +1359,10 @@ wpi_tx_data(struct wpi_softc *sc, struct mbuf *m0, struct ieee80211_node *ni, tap->wt_flags = 0; tap->wt_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); tap->wt_chan_flags = htole16(ic->ic_ibss_chan->ic_flags); + tap->wt_rate = 2; /* 1Mb/s */ + tap->wt_hwqueue = ac; + if (wh->i_fc[1] & IEEE80211_FC1_WEP) + tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP; M_DUP_PKTHDR(&mb, m0); mb.m_data = (caddr_t)tap; diff --git a/sys/dev/pci/if_wpivar.h b/sys/dev/pci/if_wpivar.h index 05366df3eb6..be68f808807 100644 --- a/sys/dev/pci/if_wpivar.h +++ b/sys/dev/pci/if_wpivar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_wpivar.h,v 1.4 2006/05/20 15:31:30 damien Exp $ */ +/* $OpenBSD: if_wpivar.h,v 1.5 2006/05/20 15:46:55 damien Exp $ */ /*- * Copyright (c) 2006 @@ -41,13 +41,17 @@ struct wpi_rx_radiotap_header { struct wpi_tx_radiotap_header { struct ieee80211_radiotap_header wt_ihdr; uint8_t wt_flags; + uint8_t wt_rate; uint16_t wt_chan_freq; uint16_t wt_chan_flags; + uint8_t wt_hwqueue; } __packed; #define WPI_TX_RADIOTAP_PRESENT \ ((1 << IEEE80211_RADIOTAP_FLAGS) | \ - (1 << IEEE80211_RADIOTAP_CHANNEL)) + (1 << IEEE80211_RADIOTAP_RATE) | \ + (1 << IEEE80211_RADIOTAP_CHANNEL) | \ + (1 << IEEE80211_RADIOTAP_HWQUEUE)) struct wpi_dma_info { bus_dmamap_t map; |