From owner-svn-src-head@FreeBSD.ORG  Sun Apr 26 21:21:48 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 71B2510656C2;
	Sun, 26 Apr 2009 21:21:48 +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 511E68FC2D;
	Sun, 26 Apr 2009 21:21:48 +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 n3QLLmVE095228;
	Sun, 26 Apr 2009 21:21:48 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3QLLmx0095227;
	Sun, 26 Apr 2009 21:21:48 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200904262121.n3QLLmx0095227@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Sun, 26 Apr 2009 21:21:48 +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: r191542 - head/sys/net80211
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 26 Apr 2009 21:21:58 -0000

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

Log:
  o add missing 802.3 bpf tap
  o add 802.11 bpf tap to output path now that it's removed from ieee80211_encap

Modified:
  head/sys/net80211/ieee80211_wds.c

Modified: head/sys/net80211/ieee80211_wds.c
==============================================================================
--- head/sys/net80211/ieee80211_wds.c	Sun Apr 26 21:21:07 2009	(r191541)
+++ head/sys/net80211/ieee80211_wds.c	Sun Apr 26 21:21:48 2009	(r191542)
@@ -277,6 +277,9 @@ ieee80211_dwds_mcast(struct ieee80211vap
 			ieee80211_free_node(ni);
 			continue;
 		}
+
+		BPF_MTAP(ifp, m);		/* 802.3 tx */
+
 		/*
 		 * Encapsulate the packet in prep for transmission.
 		 */
@@ -289,6 +292,9 @@ ieee80211_dwds_mcast(struct ieee80211vap
 		mcopy->m_flags |= M_MCAST;
 		mcopy->m_pkthdr.rcvif = (void *) ni;
 
+		if (bpf_peers_present(vap->iv_rawbpf))
+			bpf_mtap(vap->iv_rawbpf, m);
+
 		err = parent->if_transmit(parent, mcopy);
 		if (err) {
 			/* NB: IFQ_HANDOFF reclaims mbuf */