From owner-svn-src-all@FreeBSD.ORG  Sun Apr 26 21:11:12 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E0E01065672;
	Sun, 26 Apr 2009 21:11:12 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6D61D8FC08;
	Sun, 26 Apr 2009 21:11:12 +0000 (UTC) (envelope-from sam@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3QLBC1G094773;
	Sun, 26 Apr 2009 21:11:12 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3QLBCGh094772;
	Sun, 26 Apr 2009 21:11:12 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200904262111.n3QLBCGh094772@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 26 Apr 2009 21:11:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r191536 - head/sys/net80211
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Apr 2009 21:11:12 -0000

Author: sam
Date: Sun Apr 26 21:11:12 2009
New Revision: 191536
URL: http://svn.freebsd.org/changeset/base/191536

Log:
  fixup ieee80211_output handling:
  o correct bpf handling, send 'em to the right tap
  o do accouting
  o mark mbufs holding multicast frames

Modified:
  head/sys/net80211/ieee80211_output.c

Modified: head/sys/net80211/ieee80211_output.c
==============================================================================
--- head/sys/net80211/ieee80211_output.c	Sun Apr 26 21:06:11 2009	(r191535)
+++ head/sys/net80211/ieee80211_output.c	Sun Apr 26 21:11:12 2009	(r191536)
@@ -384,7 +384,17 @@ ieee80211_output(struct ifnet *ifp, stru
 	if (ieee80211_classify(ni, m))
 		senderr(EIO);		/* XXX */
 
-	BPF_MTAP(ifp, m);
+	if (bpf_peers_present(vap->iv_rawbpf))
+		bpf_mtap(vap->iv_rawbpf, m);
+
+	IEEE80211_NODE_STAT(ni, tx_data);
+	if (IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+		IEEE80211_NODE_STAT(ni, tx_mcast);
+		m->m_flags |= M_MCAST;
+	} else
+		IEEE80211_NODE_STAT(ni, tx_ucast);
+	/* NB: ieee80211_encap does not include 802.11 header */
+	IEEE80211_NODE_STAT_ADD(ni, tx_bytes, m->m_pkthdr.len);
 
 	/*
 	 * NB: DLT_IEEE802_11_RADIO identifies the parameters are