From owner-svn-src-user@FreeBSD.ORG  Wed Sep  7 07:24:47 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 16516106564A;
	Wed,  7 Sep 2011 07:24:47 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 05A348FC0A;
	Wed,  7 Sep 2011 07:24:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p877Oki2020595;
	Wed, 7 Sep 2011 07:24:46 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p877OkkZ020593;
	Wed, 7 Sep 2011 07:24:46 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109070724.p877OkkZ020593@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Wed, 7 Sep 2011 07:24:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225432 - user/adrian/if_ath_tx/sys/dev/ath
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Sep 2011 07:24:47 -0000

Author: adrian
Date: Wed Sep  7 07:24:46 2011
New Revision: 225432
URL: http://svn.freebsd.org/changeset/base/225432

Log:
  Correct the retry bit handling during software TX retransmission.
  
  * only update the bit if retries == 0;
  * if the retry bit is set, resync the descriptor

Modified:
  user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Sep  7 03:00:58 2011	(r225431)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Wed Sep  7 07:24:46 2011	(r225432)
@@ -2533,11 +2533,16 @@ ath_tx_set_retry(struct ath_softc *sc, s
 {
 	struct ieee80211_frame *wh;
 
+	wh = mtod(bf->bf_m, struct ieee80211_frame *);
+	/* Only update/resync if needed */
+	if (bf->bf_state.bfs_isretried == 0) {
+		wh->i_fc[1] |= IEEE80211_FC1_RETRY;
+		bus_dmamap_sync(sc->sc_dmat, bf->bf_dmamap,
+		    BUS_DMASYNC_PREWRITE);
+	}
 	sc->sc_stats.ast_tx_swretries++;
 	bf->bf_state.bfs_isretried = 1;
 	bf->bf_state.bfs_retries ++;
-	wh = mtod(bf->bf_m, struct ieee80211_frame *);
-	wh->i_fc[1] |= IEEE80211_FC1_RETRY;
 }
 
 static struct ath_buf *