diff options
| author | Damien Bergamini <damien@cvs.openbsd.org> | 2005-03-01 19:38:10 +0000 |
|---|---|---|
| committer | Damien Bergamini <damien@cvs.openbsd.org> | 2005-03-01 19:38:10 +0000 |
| commit | 5f390debec59935a3236b251b413b0a249b82c0c (patch) | |
| tree | a3ab12bb4be0860ad56127cef4dceed9b3b3ada6 /sys | |
| parent | d6d2cfd1949bcdd11d2835821c14ff82eea463fa (diff) | |
use one uint64_t instead of two uint32_t in rx radiotap header.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/ral.c | 6 | ||||
| -rw-r--r-- | sys/dev/ic/ralvar.h | 5 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/ic/ral.c b/sys/dev/ic/ral.c index 15e3c7ed345..326a47fe63e 100644 --- a/sys/dev/ic/ral.c +++ b/sys/dev/ic/ral.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ral.c,v 1.15 2005/02/28 17:49:22 damien Exp $ */ +/* $OpenBSD: ral.c,v 1.16 2005/03/01 19:38:09 damien Exp $ */ /*- * Copyright (c) 2005 @@ -1231,8 +1231,8 @@ ral_decryption_intr(struct ral_softc *sc) tsf_lo = RAL_READ(sc, RAL_CSR16); tsf_hi = RAL_READ(sc, RAL_CSR17); - tap->wr_tsf_lo = htole32(tsf_lo); - tap->wr_tsf_hi = htole32(tsf_hi); + tap->wr_tsf = + htole64(((uint64_t)tsf_hi << 32) | tsf_lo); tap->wr_flags = 0; tap->wr_chan_freq = htole16(ic->ic_ibss_chan->ic_freq); tap->wr_chan_flags = diff --git a/sys/dev/ic/ralvar.h b/sys/dev/ic/ralvar.h index 5b612c5326a..f6a4c08ce43 100644 --- a/sys/dev/ic/ralvar.h +++ b/sys/dev/ic/ralvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ralvar.h,v 1.5 2005/03/01 19:30:42 damien Exp $ */ +/* $OpenBSD: ralvar.h,v 1.6 2005/03/01 19:38:09 damien Exp $ */ /*- * Copyright (c) 2005 @@ -19,8 +19,7 @@ struct ral_rx_radiotap_header { struct ieee80211_radiotap_header wr_ihdr; - uint32_t wr_tsf_lo; - uint32_t wr_tsf_hi; + uint64_t wr_tsf; uint8_t wr_flags; uint16_t wr_chan_freq; uint16_t wr_chan_flags; |