Date: Sat, 10 Dec 2016 15:33:36 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r309817 - in projects/clang391-import: share/man/man5 share/mk sys/dev/usb/wlan Message-ID: <201612101533.uBAFXaXN017166@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Dec 10 15:33:36 2016 New Revision: 309817 URL: https://svnweb.freebsd.org/changeset/base/309817 Log: Merge ^/head r309804 through r309816. Modified: projects/clang391-import/share/man/man5/src.conf.5 projects/clang391-import/share/mk/src.opts.mk projects/clang391-import/sys/dev/usb/wlan/if_rsu.c projects/clang391-import/sys/dev/usb/wlan/if_rsureg.h Directory Properties: projects/clang391-import/ (props changed) Modified: projects/clang391-import/share/man/man5/src.conf.5 ============================================================================== --- projects/clang391-import/share/man/man5/src.conf.5 Sat Dec 10 15:30:39 2016 (r309816) +++ projects/clang391-import/share/man/man5/src.conf.5 Sat Dec 10 15:33:36 2016 (r309817) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 306729 2016-10-05 20:12:00Z emaste .\" $FreeBSD$ -.Dd December 9, 2016 +.Dd December 10, 2016 .Dt SRC.CONF 5 .Os .Sh NAME @@ -268,6 +268,12 @@ Set to not build .It Va WITHOUT_CAPSICUM .\" from FreeBSD: head/tools/build/options/WITHOUT_CAPSICUM 229319 2012-01-02 21:57:58Z rwatson Set to not build Capsicum support into system programs. +When set, it also enforces the following options: +.Pp +.Bl -item -compact +.It +.Va WITHOUT_CASPER +.El .It Va WITHOUT_CASPER .\" from FreeBSD: head/tools/build/options/WITHOUT_CASPER 258838 2013-12-02 08:21:28Z pjd Set to not build Casper program and related libraries. Modified: projects/clang391-import/share/mk/src.opts.mk ============================================================================== --- projects/clang391-import/share/mk/src.opts.mk Sat Dec 10 15:30:39 2016 (r309816) +++ projects/clang391-import/share/mk/src.opts.mk Sat Dec 10 15:33:36 2016 (r309817) @@ -311,6 +311,10 @@ MK_LLVM_LIBUNWIND:= no MK_GDB:= no .endif +.if ${MK_CAPSICUM} == "no" +MK_CASPER:= no +.endif + .if ${MK_LIBPTHREAD} == "no" MK_LIBTHR:= no .endif Modified: projects/clang391-import/sys/dev/usb/wlan/if_rsu.c ============================================================================== --- projects/clang391-import/sys/dev/usb/wlan/if_rsu.c Sat Dec 10 15:30:39 2016 (r309816) +++ projects/clang391-import/sys/dev/usb/wlan/if_rsu.c Sat Dec 10 15:33:36 2016 (r309817) @@ -234,6 +234,8 @@ static void rsu_rx_multi_event(struct rs static int8_t rsu_get_rssi(struct rsu_softc *, int, void *); static struct mbuf * rsu_rx_copy_to_mbuf(struct rsu_softc *, struct r92s_rx_stat *, int); +static uint32_t rsu_get_tsf_low(struct rsu_softc *); +static uint32_t rsu_get_tsf_high(struct rsu_softc *); static struct ieee80211_node * rsu_rx_frame(struct rsu_softc *, struct mbuf *, int8_t *); static struct mbuf * rsu_rx_multi_frame(struct rsu_softc *, uint8_t *, int); @@ -2223,6 +2225,18 @@ fail: return (NULL); } +static uint32_t +rsu_get_tsf_low(struct rsu_softc *sc) +{ + return (rsu_read_4(sc, R92S_TSFTR)); +} + +static uint32_t +rsu_get_tsf_high(struct rsu_softc *sc) +{ + return (rsu_read_4(sc, R92S_TSFTR + 4)); +} + static struct ieee80211_node * rsu_rx_frame(struct rsu_softc *sc, struct mbuf *m, int8_t *rssi_p) { @@ -2254,6 +2268,12 @@ rsu_rx_frame(struct rsu_softc *sc, struc /* Map HW rate index to 802.11 rate. */ tap->wr_flags = 0; /* TODO */ + tap->wr_tsft = rsu_get_tsf_high(sc); + if (le32toh(stat->tsf_low) > rsu_get_tsf_low(sc)) + tap->wr_tsft--; + tap->wr_tsft = (uint64_t)htole32(tap->wr_tsft) << 32; + tap->wr_tsft += stat->tsf_low; + if (rate < 12) { switch (rate) { /* CCK. */ Modified: projects/clang391-import/sys/dev/usb/wlan/if_rsureg.h ============================================================================== --- projects/clang391-import/sys/dev/usb/wlan/if_rsureg.h Sat Dec 10 15:30:39 2016 (r309816) +++ projects/clang391-import/sys/dev/usb/wlan/if_rsureg.h Sat Dec 10 15:33:36 2016 (r309817) @@ -51,6 +51,9 @@ #define R92S_MACID (R92S_MACIDSETTING + 0x000) #define R92S_MAR (R92S_MACIDSETTING + 0x010) +#define R92S_TIMECTRL 0x0080 +#define R92S_TSFTR (R92S_TIMECTRL + 0x000) + #define R92S_SECURITY 0x0240 #define R92S_CAMCMD (R92S_SECURITY + 0x000) #define R92S_CAMWRITE (R92S_SECURITY + 0x004) @@ -592,7 +595,7 @@ struct r92s_rx_stat { #define R92S_RXDW3_HTC 0x00004000 uint32_t rxdw4; - uint32_t rxdw5; + uint32_t tsf_low; } __packed __aligned(4); /* Rx PHY descriptor. */ @@ -735,6 +738,7 @@ static const uint8_t rsu_qid2idx_11ep[] struct rsu_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; @@ -743,7 +747,8 @@ struct rsu_rx_radiotap_header { } __packed __aligned(8); #define RSU_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?201612101533.uBAFXaXN017166>