From owner-p4-projects@FreeBSD.ORG  Sat Nov 26 06:42:17 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 70A5716A424; Sat, 26 Nov 2005 06:42:17 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 3364016A41F
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 06:42:17 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EF86643D5E
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 06:42: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 jAQ6gGqY042328
	for <perforce@freebsd.org>; Sat, 26 Nov 2005 06:42:16 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jAQ6gGiJ042325
	for perforce@freebsd.org; Sat, 26 Nov 2005 06:42:16 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 26 Nov 2005 06:42:16 GMT
Message-Id: <200511260642.jAQ6gGiJ042325@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 87258 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: Sat, 26 Nov 2005 06:42:18 -0000

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

Change 87258 by sam@sam_ebb on 2005/11/26 06:42:01

	all data frames are classified; just fetch the ac

Affected files ...

.. //depot/projects/wifi/sys/dev/ath/if_ath.c#116 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ath/if_ath.c#116 (text+ko) ====

@@ -3953,17 +3953,11 @@
 			if (try0 != ATH_TXMAXTRY)
 				ismrr = 1;
 		}
-		/*
-		 * Default all non-QoS traffic to the best-effort queue.
-		 */
-		if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) {
-			pri = M_WME_GETAC(m0);
-			if (cap->cap_wmeParams[pri].wmep_noackPolicy) {
-				flags |= HAL_TXDESC_NOACK;
-				sc->sc_stats.ast_tx_noack++;
-			}
-		} else
-			pri = WME_AC_BE;
+		pri = M_WME_GETAC(m0);
+		if (cap->cap_wmeParams[pri].wmep_noackPolicy) {
+			flags |= HAL_TXDESC_NOACK;
+			sc->sc_stats.ast_tx_noack++;
+		}
 		break;
 	default:
 		if_printf(ifp, "bogus frame type 0x%x (%s)\n",