From owner-svn-src-projects@FreeBSD.ORG  Fri Feb 20 23:14:32 2009
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B26BD1065672;
	Fri, 20 Feb 2009 23:14:32 +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 9EAF78FC1B;
	Fri, 20 Feb 2009 23:14:32 +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 n1KNEWgU041864;
	Fri, 20 Feb 2009 23:14:32 GMT (envelope-from sam@svn.freebsd.org)
Received: (from sam@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KNEWXr041863;
	Fri, 20 Feb 2009 23:14:32 GMT (envelope-from sam@svn.freebsd.org)
Message-Id: <200902202314.n1KNEWXr041863@svn.freebsd.org>
From: Sam Leffler <sam@FreeBSD.org>
Date: Fri, 20 Feb 2009 23:14:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188873 - in projects/vap7/sys: . contrib/pf dev
	dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210
	dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
	dev/ath/ath_hal/ar5312 dev/ath/ath_hal/ar54...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2009 23:14:32 -0000

Author: sam
Date: Fri Feb 20 23:14:32 2009
New Revision: 188873
URL: http://svn.freebsd.org/changeset/base/188873

Log:
  merge r188864: wme fixups

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)
  projects/vap7/sys/net80211/ieee80211_proto.c

Modified: projects/vap7/sys/net80211/ieee80211_proto.c
==============================================================================
--- projects/vap7/sys/net80211/ieee80211_proto.c	Fri Feb 20 23:13:50 2009	(r188872)
+++ projects/vap7/sys/net80211/ieee80211_proto.c	Fri Feb 20 23:14:32 2009	(r188873)
@@ -853,7 +853,7 @@ ieee80211_wme_initparams_locked(struct i
 
 	IEEE80211_LOCK_ASSERT(ic);
 
-	if ((ic->ic_caps & IEEE80211_C_WME) == 0)
+	if ((ic->ic_caps & IEEE80211_C_WME) == 0 || ic->ic_nrunning > 1)
 		return;
 
 	/*
@@ -905,6 +905,7 @@ ieee80211_wme_initparams_locked(struct i
 		 */
 		wme->wme_hipri_switch_thresh =
 			(HIGH_PRI_SWITCH_THRESH * vap->iv_bss->ni_intval) / 100;
+		wme->wme_flags &= ~WME_F_AGGRMODE;
 		ieee80211_wme_updateparams(vap);
 	}
 }