From owner-p4-projects@FreeBSD.ORG  Tue Nov 23 22:46:16 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5F0C716A4D0; Tue, 23 Nov 2004 22:46:16 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3AA4916A4CE
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:46:16 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 29DF043D5C
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:46:16 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id iANMkGw2078159
	for <perforce@freebsd.org>; Tue, 23 Nov 2004 22:46:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id iANMkFbf078156
	for perforce@freebsd.org; Tue, 23 Nov 2004 22:46:15 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 23 Nov 2004 22:46:15 GMT
Message-Id: <200411232246.iANMkFbf078156@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>
Subject: PERFORCE change 65738 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 23 Nov 2004 22:46:16 -0000

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

Change 65738 by sam@sam_ebb on 2004/11/23 22:45:31

	correct wme parameter update for dynamic changes found when
	updating beacon frames

Affected files ...

.. //depot/projects/wifi/sys/net80211/ieee80211_output.c#11 edit

Differences ...

==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#11 (text+ko) ====

@@ -1441,6 +1441,13 @@
 	if (ic->ic_flags & IEEE80211_F_WME) {
 		struct ieee80211_wme_state *wme = &ic->ic_wme;
 
+		/*
+		 * Check for agressive mode change.  When there is
+		 * significant high priority traffic in the BSS
+		 * throttle back BE traffic by using conservative
+		 * parameters.  Otherwise BE uses agressive params
+		 * to optimize performance of legacy/non-QoS traffic.
+		 */
 		if (wme->wme_flags & WME_F_AGGRMODE) {
 			if (wme->wme_hipri_traffic >
 			    wme->wme_hipri_switch_thresh) {
@@ -1448,7 +1455,7 @@
 				    "%s: traffic %u, disable aggressive mode\n",
 				    __func__, wme->wme_hipri_traffic);
 				wme->wme_flags &= ~WME_F_AGGRMODE;
-				wme->wme_update(ic);
+				ieee80211_wme_updateparams_locked(ic);
 				wme->wme_hipri_traffic =
 					wme->wme_hipri_switch_hysteresis;
 			} else
@@ -1460,7 +1467,7 @@
 				    "%s: traffic %u, enable aggressive mode\n",
 				    __func__, wme->wme_hipri_traffic);
 				wme->wme_flags |= WME_F_AGGRMODE;
-				wme->wme_update(ic);
+				ieee80211_wme_updateparams_locked(ic);
 				wme->wme_hipri_traffic = 0;
 			} else
 				wme->wme_hipri_traffic =