From owner-p4-projects@FreeBSD.ORG  Thu Mar  6 23:12:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D7A6A1065677; Thu,  6 Mar 2008 23:12:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 960FC1065674
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 23:12:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 853AF8FC16
	for <perforce@freebsd.org>; Thu,  6 Mar 2008 23:12:05 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m26NC5xV058138
	for <perforce@freebsd.org>; Thu, 6 Mar 2008 23:12:05 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m26NC5t5058136
	for perforce@freebsd.org; Thu, 6 Mar 2008 23:12:05 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 6 Mar 2008 23:12:05 GMT
Message-Id: <200803062312.m26NC5t5058136@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 137034 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: Thu, 06 Mar 2008 23:12:06 -0000

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

Change 137034 by sam@sam_ebb on 2008/03/06 23:11:22

	purge 802.3 bpf taps, these happen in ether_input (we should
	never reference if_bpf in net80211, only iv_rawbpf for
	DLT_IEEE802_11 tap'ing)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#18 edit
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#29 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_hostap.c#18 (text+ko) ====

@@ -375,13 +375,6 @@
 			/* XXX only if dwds in use? */
 			ieee80211_dwds_mcast(vap, m);
 		}
-		/*
-		 * XXX If we forward packet into transmitter of the AP,
-		 * we don't need to duplicate for DLT_EN10MB.
-		 */
-		if (bpf_peers_present(ifp->if_bpf))
-			bpf_mtap(ifp->if_bpf, m);
-
 		if (ni->ni_vlan != 0) {
 			/* attach vlan tag */
 			m->m_pkthdr.ether_vtag = ni->ni_vlan;

==== //depot/projects/vap/sys/net80211/ieee80211_input.c#29 (text+ko) ====

@@ -215,13 +215,6 @@
 	/* clear driver/net80211 flags before passing up */
 	m->m_flags &= ~M_80211_RX;
 
-	/*
-	 * XXX If we forward packet into transmitter of the AP,
-	 * we don't need to duplicate for DLT_EN10MB.
-	 */
-	if (bpf_peers_present(ifp->if_bpf))
-		bpf_mtap(ifp->if_bpf, m);
-
 	if (ni->ni_vlan != 0) {
 		/* attach vlan tag */
 		m->m_pkthdr.ether_vtag = ni->ni_vlan;