Date: Mon, 14 Dec 2015 12:36:10 +0000 (UTC) From: Andriy Voskoboinyk <avos@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292203 - head/sys/dev/usb/wlan Message-ID: <201512141236.tBECaAtN079691@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avos Date: Mon Dec 14 12:36:10 2015 New Revision: 292203 URL: https://svnweb.freebsd.org/changeset/base/292203 Log: urtwn: add TSF field into RX radiotap header. Tested with RTL8188EU, MONITOR/STA modes. Reviewed by: kevlo Approved by: adrian (mentor) Differential Revision: https://reviews.freebsd.org/D3831 Modified: head/sys/dev/usb/wlan/if_urtwn.c head/sys/dev/usb/wlan/if_urtwnvar.h Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Mon Dec 14 11:39:46 2015 (r292202) +++ head/sys/dev/usb/wlan/if_urtwn.c Mon Dec 14 12:36:10 2015 (r292203) @@ -259,6 +259,7 @@ static int urtwn_key_delete(struct ieee 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, u 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]; @@ -2110,6 +2121,12 @@ urtwn_tsf_sync_enable(struct urtwn_softc } 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) { uint8_t reg; @@ -2162,7 +2179,6 @@ urtwn_ibss_recv_mgmt(struct ieee80211_no (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_no if (ni_tstamp >= curr_tstamp) (void) ieee80211_ibss_merge(ni); -#else - (void) sc; - (void) curr_tstamp; -#endif } } Modified: head/sys/dev/usb/wlan/if_urtwnvar.h ============================================================================== --- head/sys/dev/usb/wlan/if_urtwnvar.h Mon Dec 14 11:39:46 2015 (r292202) +++ head/sys/dev/usb/wlan/if_urtwnvar.h Mon Dec 14 12:36:10 2015 (r292203) @@ -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 | \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201512141236.tBECaAtN079691>