From owner-p4-projects@FreeBSD.ORG  Sun May  8 23:10:10 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5997416A4E8; Sun,  8 May 2005 23:10:10 +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 34DB716A4E6
	for <perforce@freebsd.org>; Sun,  8 May 2005 23:10:10 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1DF2F43D49
	for <perforce@freebsd.org>; Sun,  8 May 2005 23:10:10 +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 j48NAAbq007333
	for <perforce@freebsd.org>; Sun, 8 May 2005 23:10:10 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j48NA99Q007330
	for perforce@freebsd.org; Sun, 8 May 2005 23:10:09 GMT
	(envelope-from sam@freebsd.org)
Date: Sun, 8 May 2005 23:10:09 GMT
Message-Id: <200505082310.j48NA99Q007330@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 76714 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: Sun, 08 May 2005 23:10:11 -0000

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

Change 76714 by sam@sam_ebb on 2005/05/08 23:09:20

	set priority on outbound management frames

Affected files ...

.. //depot/projects/vap/sys/net80211/ieee80211_output.c#9 edit

Differences ...

==== //depot/projects/vap/sys/net80211/ieee80211_output.c#9 (text+ko) ====

@@ -259,7 +259,7 @@
 			ieee80211_pwrsave(ni, m);
 			goto reclaim;
 		}
-		/* calculate priority so we can find the tx queue */
+		/* calculate priority so drivers can find the tx queue */
 		if (ieee80211_classify(ni, m)) {
 			IEEE80211_DPRINTF(vap, IEEE80211_MSG_OUTPUT,
 				"%s: discard, classification failure\n",
@@ -402,6 +402,9 @@
 			ether_sprintf(wh->i_addr1), __func__);
 		wh->i_fc[1] |= IEEE80211_FC1_WEP;
 	}
+
+	IEEE80211_NODE_STAT(ni, tx_mgmt);
+
 #ifdef IEEE80211_DEBUG
 	/* avoid printing too many frames */
 	if ((ieee80211_msg_debug(vap) && doprint(vap, type)) ||
@@ -416,7 +419,12 @@
 #endif
 	BPF_MTAP(ifp, m);		/* 802.11 tx path */
 
-	IEEE80211_NODE_STAT(ni, tx_mgmt);
+	if (ni->ni_flags & IEEE80211_NODE_QOS) {
+		/* NB: force all management frames to highest queue */
+		M_WME_SETAC(m, WME_AC_VO);
+	} else
+		M_WME_SETAC(m, WME_AC_BE);
+
 	IF_ENQUEUE(&ic->ic_mgtq, m);	/* NB: alternate tx path */
 	if_start(ic->ic_ifp);		/* dispatch to device */
 	return 0;