From owner-p4-projects@FreeBSD.ORG  Mon May 26 19:03:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 075F71065677; Mon, 26 May 2008 19:03:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD6051065674
	for <perforce@freebsd.org>; Mon, 26 May 2008 19:03:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AA6878FC16
	for <perforce@freebsd.org>; Mon, 26 May 2008 19:03:03 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m4QJ33tt081047
	for <perforce@freebsd.org>; Mon, 26 May 2008 19:03:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m4QJ33J1081045
	for perforce@freebsd.org; Mon, 26 May 2008 19:03:03 GMT
	(envelope-from sam@freebsd.org)
Date: Mon, 26 May 2008 19:03:03 GMT
Message-Id: <200805261903.m4QJ33J1081045@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 142311 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: Mon, 26 May 2008 19:03:04 -0000

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

Change 142311 by sam@sam_ebb on 2008/05/26 19:02:04

	send EAPOL frames at the same rate used for mgt frames; they
	are too important to chance to a potentially unreliable rate
	(and infrequent enough to not burden the net)

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#75 edit

Differences ...

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

@@ -4712,6 +4712,7 @@
 	flags = HAL_TXDESC_CLRDMASK;		/* XXX needed for crypto errs */
 	ismrr = 0;				/* default no multi-rate retry*/
 	pri = M_WME_GETAC(m0);			/* honor classification */
+	/* XXX use txparams instead of fixed values */
 	/*
 	 * Calculate Atheros packet type from IEEE80211 packet header,
 	 * setup for rate calculations, and select h/w transmit queue.
@@ -4747,8 +4748,8 @@
 		atype = HAL_PKT_TYPE_NORMAL;		/* default */
 		/*
 		 * Data frames: multicast frames go out at a fixed rate,
-		 * otherwise consult the rate control module for the
-		 * rate to use.
+		 * EAPOL frames use the mgmt frame rate; otherwise consult
+		 * the rate control module for the rate to use.
 		 */
 		if (ismcast) {
 			rix = an->an_mcastrix;
@@ -4756,6 +4757,13 @@
 			if (shortPreamble)
 				txrate |= rt->info[rix].shortPreamble;
 			try0 = 1;
+		} else if (m0->m_flags & M_EAPOL) {
+			/* XXX? maybe always use long preamble? */
+			rix = an->an_mgmtrix;
+			txrate = rt->info[rix].rateCode;
+			if (shortPreamble)
+				txrate |= rt->info[rix].shortPreamble;
+			try0 = ATH_TXMAXTRY;	/* XXX?too many? */
 		} else {
 			ath_rate_findrate(sc, an, shortPreamble, pktlen,
 				&rix, &try0, &txrate);