From owner-p4-projects@FreeBSD.ORG  Sat Nov 29 19:39:36 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 24BE716A4D1; Sat, 29 Nov 2003 19:39:36 -0800 (PST)
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 DBA3716A4CE
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 19:39:35 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C850744035
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 19:39:07 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAU3d6XJ080492
	for <perforce@freebsd.org>; Sat, 29 Nov 2003 19:39:06 -0800 (PST)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAU3d5ia080489
	for perforce@freebsd.org; Sat, 29 Nov 2003 19:39:05 -0800 (PST)
	(envelope-from sam@freebsd.org)
Date: Sat, 29 Nov 2003 19:39:05 -0800 (PST)
Message-Id: <200311300339.hAU3d5ia080489@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>
Subject: PERFORCE change 43164 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sun, 30 Nov 2003 03:39:36 -0000
X-List-Received-Date: Sun, 30 Nov 2003 03:39:36 -0000

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

Change 43164 by sam@sam_ebb on 2003/11/29 19:38:53

	add flags and rate to xmit side tapping per netbsd

Affected files ...

.. //depot/projects/netperf/sys/dev/wi/if_wi.c#17 edit
.. //depot/projects/netperf/sys/dev/wi/if_wireg.h#5 edit

Differences ...

==== //depot/projects/netperf/sys/dev/wi/if_wi.c#17 (text+ko) ====

@@ -979,6 +979,8 @@
 		}
 #if NBPFILTER > 0
 		if (sc->sc_drvbpf) {
+			sc->sc_tx_th.wt_rate =
+				ni->ni_rates.rs_rates[ni->ni_txrate];
 			bpf_mtap2(sc->sc_drvbpf,
 				&sc->sc_tx_th, sizeof(sc->sc_tx_th), m0);
 		}
@@ -1531,6 +1533,9 @@
 		sc->sc_rx_th.wr_time =
 			htole32((frmhdr.wi_rx_tstamp1 << 16) |
 				frmhdr.wi_rx_tstamp0);
+		sc->sc_rx_th.wr_flags = 0;
+		if (frmhdr.wi_status & WI_STAT_PCF)
+			sc->sc_rx_th.wr_flags |= IEEE80211_RADIOTAP_F_CFP;
 		bpf_mtap2(sc->sc_drvbpf,
 			&sc->sc_rx_th, sizeof(sc->sc_rx_th), m);
 	}

==== //depot/projects/netperf/sys/dev/wi/if_wireg.h#5 (text+ko) ====

@@ -707,10 +707,14 @@
 };
 
 #define WI_TX_RADIOTAP_PRESENT \
-	((1 << IEEE80211_RADIOTAP_CHANNEL))
+	((1 << IEEE80211_RADIOTAP_FLAGS) | \
+	 (1 << IEEE80211_RADIOTAP_RATE) | \
+	 (1 << IEEE80211_RADIOTAP_CHANNEL))
 
 struct wi_tx_radiotap_header {
 	struct ieee80211_radiotap_header wt_ihdr;
+	u_int8_t	wt_flags;
+	u_int8_t	wt_rate;
 	u_int16_t	wt_chan_freq;
 	u_int16_t	wt_chan_flags;
 };