From owner-p4-projects@FreeBSD.ORG  Fri Mar 28 19:23:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 06AD51065671; Fri, 28 Mar 2008 19:23:29 +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 BA5121065670
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 19:23:28 +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 A7D198FC12
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 19:23:28 +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 m2SJNSCD012130
	for <perforce@freebsd.org>; Fri, 28 Mar 2008 19:23:28 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2SJNSLk012128
	for perforce@freebsd.org; Fri, 28 Mar 2008 19:23:28 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 28 Mar 2008 19:23:28 GMT
Message-Id: <200803281923.m2SJNSLk012128@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 138849 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: Fri, 28 Mar 2008 19:23:29 -0000

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

Change 138849 by sam@sam_ebb on 2008/03/28 19:22:28

	filter out PROMISC on hostap vaps so each driver doesn't need to
	do this (as was historically done to workaround the bridge)

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211.c#31 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211.c#31 (text+ko) ====

@@ -541,6 +541,14 @@
 	bit = 0;
 	TAILQ_FOREACH(vap, &ic->ic_vaps, iv_next)
 		if (vap->iv_ifp->if_flags & flag) {
+			/*
+			 * XXX the bridge sets PROMISC but we don't want to
+			 * enable it on the device, discard here so all the
+			 * drivers don't need to special-case it
+			 */
+			if (flag == IFF_PROMISC &&
+			    vap->iv_opmode == IEEE80211_M_HOSTAP)
+				continue;
 			bit = 1;
 			break;
 		}