From owner-svn-src-head@FreeBSD.ORG  Fri Jul 31 19:12:20 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 2B89D106566B;
	Fri, 31 Jul 2009 19:12:20 +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 1A5C28FC08;
	Fri, 31 Jul 2009 19:12:20 +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 n6VJCJDZ078351;
	Fri, 31 Jul 2009 19:12:19 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6VJCJSX078349;
	Fri, 31 Jul 2009 19:12:19 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200907311912.n6VJCJSX078349@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 31 Jul 2009 19:12:19 +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: r196004 - 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: Fri, 31 Jul 2009 19:12:20 -0000

Author: sam
Date: Fri Jul 31 19:12:19 2009
New Revision: 196004
URL: http://svn.freebsd.org/changeset/base/196004

Log:
  Filter setting IFF_PROMISC on tdma vaps; we don't want the underyling device
  to be in promiscuous mode as we have a h/w bssid.
  
  Approved by:	re (kib)

Modified:
  head/sys/net80211/ieee80211.c

Modified: head/sys/net80211/ieee80211.c
==============================================================================
--- head/sys/net80211/ieee80211.c	Fri Jul 31 17:57:16 2009	(r196003)
+++ head/sys/net80211/ieee80211.c	Fri Jul 31 19:12:19 2009	(r196004)
@@ -638,7 +638,8 @@ ieee80211_syncifflag_locked(struct ieee8
 			 */
 			if (flag == IFF_PROMISC &&
 			    !(vap->iv_opmode == IEEE80211_M_MONITOR ||
-			      vap->iv_opmode == IEEE80211_M_AHDEMO))
+			      (vap->iv_opmode == IEEE80211_M_AHDEMO &&
+			       (vap->iv_caps & IEEE80211_C_TDMA) == 0)))
 				continue;
 			bit = 1;
 			break;