From owner-p4-projects@FreeBSD.ORG  Sat Oct 18 23:21: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 741DC106568C; Sat, 18 Oct 2008 23:21: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 387E51065689
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:21:04 +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 0D7588FC0A
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:21:04 +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 m9INL3Gq076998
	for <perforce@freebsd.org>; Sat, 18 Oct 2008 23:21:03 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m9INL3Ax076996
	for perforce@freebsd.org; Sat, 18 Oct 2008 23:21:03 GMT
	(envelope-from sam@freebsd.org)
Date: Sat, 18 Oct 2008 23:21:03 GMT
Message-Id: <200810182321.m9INL3Ax076996@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 151527 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:21:04 -0000

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

Change 151527 by sam@sam_ebb on 2008/10/18 23:20:20

	don't indicate success status in the tx callback unless the frame
	was ACK'd

Affected files ...

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

Differences ...

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

@@ -5091,7 +5091,8 @@
 			 */
 			if (bf->bf_m->m_flags & M_TXCB)
 				ieee80211_process_callback(ni, bf->bf_m,
-					ts->ts_status);
+				    (bf->bf_flags & HAL_TXDESC_NOACK) == 0 ?
+				        ts->ts_status : HAL_TXERR_XRETRY);
 			/*
 			 * Reclaim reference to node.
 			 *