From owner-p4-projects@FreeBSD.ORG  Thu Mar 27 22:03:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C59101065674; Thu, 27 Mar 2008 22:03:12 +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 859A5106564A
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 22:03:12 +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 5B7388FC1C
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 22:03:12 +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 m2RM3CxY078569
	for <perforce@freebsd.org>; Thu, 27 Mar 2008 22:03:12 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2RM3C5Y078567
	for perforce@freebsd.org; Thu, 27 Mar 2008 22:03:12 GMT
	(envelope-from sam@freebsd.org)
Date: Thu, 27 Mar 2008 22:03:12 GMT
Message-Id: <200803272203.m2RM3C5Y078567@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 138753 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, 27 Mar 2008 22:03:13 -0000

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

Change 138753 by sam@sam_ebb on 2008/03/27 22:02:35

	honor explicit promisc request on parent device

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#49 edit

Differences ...

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

@@ -2492,6 +2492,8 @@
 	if (ic->ic_opmode != IEEE80211_M_HOSTAP &&
 	    (ifp->if_flags & IFF_PROMISC))
 		rfilt |= HAL_RX_FILTER_PROM;
+	if (ifp->if_flags & IFF_PPROMISC)
+		rfilt |= HAL_RX_FILTER_PROM;
 	if (ic->ic_opmode == IEEE80211_M_STA ||
 	    sc->sc_opmode == HAL_M_IBSS ||
 	    sc->sc_swbmiss || sc->sc_scanning)