From owner-p4-projects@FreeBSD.ORG  Sat Dec  3 04:33:22 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3C29C16A423; Sat,  3 Dec 2005 04:33:22 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id D25E316A420
	for <perforce@freebsd.org>; Sat,  3 Dec 2005 04:33:21 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 97B0243D5A
	for <perforce@freebsd.org>; Sat,  3 Dec 2005 04:33:21 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jB34XLLW008274
	for <perforce@freebsd.org>; Sat, 3 Dec 2005 04:33:21 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jB34XLKC008271
	for perforce@freebsd.org; Sat, 3 Dec 2005 04:33:21 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 3 Dec 2005 04:33:21 GMT
Message-Id: <200512030433.jB34XLKC008271@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 87680 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 03 Dec 2005 04:33:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=87680

Change 87680 by sam@sam_ebb on 2005/12/03 04:32:58

	add tsf to radiotap on the tx side

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#121 edit
.. //depot/projects/wifi/sys/dev/ath/if_athioctl.h#13 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#121 (text+ko) ====

@@ -4169,6 +4169,9 @@
 	if (ic->ic_rawbpf)
 		bpf_mtap(ic->ic_rawbpf, m0);
 	if (sc->sc_drvbpf) {
+		u_int64_t tsf = ath_hal_gettsf64(ah);
+
+		sc->sc_tx_th.wt_tsf = htole64(tsf);
 		sc->sc_tx_th.wt_flags = sc->sc_hwmap[txrate].txflags;
 		if (iswep)
 			sc->sc_tx_th.wt_flags |= IEEE80211_RADIOTAP_F_WEP;

==== //depot/projects/wifi/sys/dev/ath/if_athioctl.h#13 (text+ko) ====

@@ -148,7 +148,7 @@
 struct ath_rx_radiotap_header {
 	struct ieee80211_radiotap_header wr_ihdr;
 	u_int64_t	wr_tsf;
-	u_int8_t	wr_flags;		/* XXX for padding */
+	u_int8_t	wr_flags;
 	u_int8_t	wr_rate;
 	u_int16_t	wr_chan_freq;
 	u_int16_t	wr_chan_flags;
@@ -158,6 +158,7 @@
 };
 
 #define ATH_TX_RADIOTAP_PRESENT (		\
+	(1 << IEEE80211_RADIOTAP_TSFT)		| \
 	(1 << IEEE80211_RADIOTAP_FLAGS)		| \
 	(1 << IEEE80211_RADIOTAP_RATE)		| \
 	(1 << IEEE80211_RADIOTAP_CHANNEL)	| \
@@ -167,7 +168,8 @@
 
 struct ath_tx_radiotap_header {
 	struct ieee80211_radiotap_header wt_ihdr;
-	u_int8_t	wt_flags;		/* XXX for padding */
+	u_int64_t	wt_tsf;
+	u_int8_t	wt_flags;
 	u_int8_t	wt_rate;
 	u_int16_t	wt_chan_freq;
 	u_int16_t	wt_chan_flags;