From owner-svn-src-head@FreeBSD.ORG Mon Oct 27 17:52:41 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DD6C71065685; Mon, 27 Oct 2008 17:52:41 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CC2888FC2B; Mon, 27 Oct 2008 17:52:41 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9RHqfPp047413; Mon, 27 Oct 2008 17:52:41 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9RHqfCd047411; Mon, 27 Oct 2008 17:52:41 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200810271752.m9RHqfCd047411@svn.freebsd.org> From: Sam Leffler Date: Mon, 27 Oct 2008 17:52:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r184359 - head/sys/dev/ath X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Oct 2008 17:52:42 -0000 Author: sam Date: Mon Oct 27 17:52:41 2008 New Revision: 184359 URL: http://svn.freebsd.org/changeset/base/184359 Log: correct callback status parameter; only indicate success when an ACK was received Modified: head/sys/dev/ath/if_ath.c Modified: head/sys/dev/ath/if_ath.c ============================================================================== --- head/sys/dev/ath/if_ath.c Mon Oct 27 17:51:24 2008 (r184358) +++ head/sys/dev/ath/if_ath.c Mon Oct 27 17:52:41 2008 (r184359) @@ -5078,7 +5078,8 @@ ath_tx_processq(struct ath_softc *sc, st */ if (bf->bf_m->m_flags & M_TXCB) ieee80211_process_callback(ni, bf->bf_m, - ts->ts_status); + (bf->bf_txflags & HAL_TXDESC_NOACK) == 0 ? + ts->ts_status : HAL_TXERR_XRETRY); /* * Reclaim reference to node. *