Attachment #156671 for bug #200136




		if (ieee80211_radiotap_active(ic)) {
			struct rum_rx_radiotap_header *tap = &sc->sc_rxtap;

			/* XXX read tsf */
			tap->wr_flags = 0;
			tap->wr_rate = ieee80211_plcp2rate(sc->sc_rx_desc.rate,
			    (flags & RT2573_RX_OFDM) ?
			    IEEE80211_T_OFDM : IEEE80211_T_CCK);
			rum_read_multi(sc, RT2573_TXRX_CSR12, &tap->wr_tsft,
			    sizeof(tap->wr_tsft));
			tap->wr_antsignal = RT2573_NOISE_FLOOR + rssi;
			tap->wr_antnoise = RT2573_NOISE_FLOOR;
			tap->wr_antenna = sc->rx_ant;

Lines 22-27 Link Here

(-)sys/dev/usb/wlan/if_rumvar.h (-1 / +3 lines)
22		22
23	struct rum_rx_radiotap_header {	23	struct rum_rx_radiotap_header {
24	struct ieee80211_radiotap_header wr_ihdr;	24	struct ieee80211_radiotap_header wr_ihdr;
		25	uint64_t wr_tsft;
25	uint8_t wr_flags;	26	uint8_t wr_flags;
26	uint8_t wr_rate;	27	uint8_t wr_rate;
27	uint16_t wr_chan_freq;	28	uint16_t wr_chan_freq;
Lines 32-38 Link Here
32	} __packed __aligned(8);	33	} __packed __aligned(8);
33		34
34	#define RT2573_RX_RADIOTAP_PRESENT \	35	#define RT2573_RX_RADIOTAP_PRESENT \
35	((1 << IEEE80211_RADIOTAP_FLAGS) \| \	36	((1 << IEEE80211_RADIOTAP_TSFT) \| \
		37	(1 << IEEE80211_RADIOTAP_FLAGS) \| \
36	(1 << IEEE80211_RADIOTAP_RATE) \| \	38	(1 << IEEE80211_RADIOTAP_RATE) \| \
37	(1 << IEEE80211_RADIOTAP_CHANNEL) \| \	39	(1 << IEEE80211_RADIOTAP_CHANNEL) \| \
38	(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) \| \	40	(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) \| \

Return to bug 200136

Lines 932-942 Link Here

(-)sys/dev/usb/wlan/if_rum.c (-1 / +2 lines)
932	if (ieee80211_radiotap_active(ic)) {	932	if (ieee80211_radiotap_active(ic)) {
933	struct rum_rx_radiotap_header *tap = &sc->sc_rxtap;	933	struct rum_rx_radiotap_header *tap = &sc->sc_rxtap;
934		934
935	/* XXX read tsf */
936	tap->wr_flags = 0;	935	tap->wr_flags = 0;
937	tap->wr_rate = ieee80211_plcp2rate(sc->sc_rx_desc.rate,	936	tap->wr_rate = ieee80211_plcp2rate(sc->sc_rx_desc.rate,
938	(flags & RT2573_RX_OFDM) ?	937	(flags & RT2573_RX_OFDM) ?
939	IEEE80211_T_OFDM : IEEE80211_T_CCK);	938	IEEE80211_T_OFDM : IEEE80211_T_CCK);
		939	rum_read_multi(sc, RT2573_TXRX_CSR12, &tap->wr_tsft,
		940	sizeof(tap->wr_tsft));
940	tap->wr_antsignal = RT2573_NOISE_FLOOR + rssi;	941	tap->wr_antsignal = RT2573_NOISE_FLOOR + rssi;
941	tap->wr_antnoise = RT2573_NOISE_FLOOR;	942	tap->wr_antnoise = RT2573_NOISE_FLOOR;
942	tap->wr_antenna = sc->rx_ant;	943	tap->wr_antenna = sc->rx_ant;