d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

urtwn: add TSF field into RX radiotap header.

Browse Source 
Tested with RTL8188EU, MONITOR/STA modes.

Reviewed by:	kevlo
Approved by:	adrian (mentor)
Differential Revision:	https://reviews.freebsd.org/D3831
This commit is contained in:
Andriy Voskoboinyk 2015-12-14 12:36:10 +00:00
parent b6d2c99a09
commit 352761d514
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/usb/wlan/if_urtwn.c
View File

@ -259,6 +259,7 @@ static int urtwn_key_delete(struct ieee80211vap *,
static void urtwn_tsf_task_adhoc(void *, int);
static void urtwn_tsf_sync_enable(struct urtwn_softc *,
struct ieee80211vap *);
static void urtwn_get_tsf(struct urtwn_softc *, uint64_t *);
static void urtwn_set_led(struct urtwn_softc *, int, int);
static void urtwn_set_mode(struct urtwn_softc *, uint8_t);
static void urtwn_ibss_recv_mgmt(struct ieee80211_node *,
@ -784,6 +785,16 @@ urtwn_rx_frame(struct urtwn_softc *sc, uint8_t *buf, int pktlen, int *rssi_p)
struct urtwn_rx_radiotap_header *tap = &sc->sc_rxtap;
tap->wr_flags = 0;
urtwn_get_tsf(sc, &tap->wr_tsft);
if (__predict_false(le32toh((uint32_t)tap->wr_tsft) <
le32toh(stat->rxdw5))) {
tap->wr_tsft = le32toh(tap->wr_tsft >> 32) - 1;
tap->wr_tsft = (uint64_t)htole32(tap->wr_tsft) << 32;
} else
tap->wr_tsft &= 0xffffffff00000000;
tap->wr_tsft += stat->rxdw5;
/* Map HW rate index to 802.11 rate. */
if (!(rxdw3 & R92C_RXDW3_HT)) {
tap->wr_rate = ridx2rate[rate];
@ -2109,6 +2120,12 @@ urtwn_tsf_sync_enable(struct urtwn_softc *sc, struct ieee80211vap *vap)
}
}
static void
urtwn_get_tsf(struct urtwn_softc *sc, uint64_t *buf)
{
urtwn_read_region_1(sc, R92C_TSFTR, (uint8_t *)buf, sizeof(*buf));
}
static void
urtwn_set_led(struct urtwn_softc *sc, int led, int on)
{
@ -2162,7 +2179,6 @@ urtwn_ibss_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
(subtype == IEEE80211_FC0_SUBTYPE_BEACON ||
subtype == IEEE80211_FC0_SUBTYPE_PROBE_RESP)) {
ni_tstamp = le64toh(ni->ni_tstamp.tsf);
#ifdef D3831
URTWN_LOCK(sc);
urtwn_get_tsf(sc, &curr_tstamp);
URTWN_UNLOCK(sc);
@ -2170,10 +2186,6 @@ urtwn_ibss_recv_mgmt(struct ieee80211_node *ni, struct mbuf *m, int subtype,
if (ni_tstamp >= curr_tstamp)
(void) ieee80211_ibss_merge(ni);
#else
(void) sc;
(void) curr_tstamp;
#endif
}
}

4
sys/dev/usb/wlan/if_urtwnvar.h
View File

@ -33,6 +33,7 @@
struct urtwn_rx_radiotap_header {
struct ieee80211_radiotap_header wr_ihdr;
uint64_t wr_tsft;
uint8_t wr_flags;
uint8_t wr_rate;
uint16_t wr_chan_freq;
@ -42,7 +43,8 @@ struct urtwn_rx_radiotap_header {
} __packed __aligned(8);
#define URTWN_RX_RADIOTAP_PRESENT \
(1 << IEEE80211_RADIOTAP_FLAGS | \
(1 << IEEE80211_RADIOTAP_TSFT | \
1 << IEEE80211_RADIOTAP_FLAGS | \
1 << IEEE80211_RADIOTAP_RATE | \
1 << IEEE80211_RADIOTAP_CHANNEL | \
1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL | \