From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:18:01 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F3CB91065697; Sat, 18 Oct 2008 23:18:00 +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 B74891065692
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:18:00 +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 A58468FC08
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:18:00 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m9INI09t076680
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:18:00 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INI0nT076678
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:18:00 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:18:00 GMT
Message-Id: <200810182318.m9INI0nT076678@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 151525 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, 18 Oct 2008 23:18:01 -0000

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

Change 151525 by sam@sam_ebb on 2008/10/18 23:17:30

	don't reset the inactivity timer on tx ok status unless we
	actually got an ACK back

Affected files ...

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

Differences ...

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

@@ -5054,7 +5054,8 @@
 				pri = M_WME_GETAC(bf->bf_m);
 				if (pri >= WME_AC_VO)
 					ic->ic_wme.wme_hipri_traffic++;
-				ni->ni_inact = ni->ni_inact_reload;
+				if ((bf->bf_flags & HAL_TXDESC_NOACK) == 0)
+					ni->ni_inact = ni->ni_inact_reload;
 			} else {
 				if (ts->ts_status & HAL_TXERR_XRETRY)
 					sc->sc_stats.ast_tx_xretries++;