From owner-svn-src-user@FreeBSD.ORG  Mon Sep 19 04:06:56 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 CDC75106564A;
	Mon, 19 Sep 2011 04:06:56 +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 BE8D78FC08;
	Mon, 19 Sep 2011 04:06:56 +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 p8J46ufg062531;
	Mon, 19 Sep 2011 04:06:56 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8J46uTs062528;
	Mon, 19 Sep 2011 04:06:56 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109190406.p8J46uTs062528@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Mon, 19 Sep 2011 04:06:56 +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: r225655 - 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: Mon, 19 Sep 2011 04:06:56 -0000

Author: adrian
Date: Mon Sep 19 04:06:56 2011
New Revision: 225655
URL: http://svn.freebsd.org/changeset/base/225655

Log:
  Flip on cleanup when disabling AMPDU.

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	Mon Sep 19 00:46:49 2011	(r225654)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c	Mon Sep 19 04:06:56 2011	(r225655)
@@ -2967,7 +2967,7 @@ ath_tx_aggr_comp_aggr(struct ath_softc *
 	/*
 	 * Punt cleanup to the relevant function, not our problem now
 	 */
-	if (0 && atid->cleanup_inprogress) {
+	if (atid->cleanup_inprogress) {
 		ATH_TXQ_UNLOCK(sc->sc_ac2q[atid->ac]);
 		ath_tx_comp_cleanup_aggr(sc, bf_first);
 		return;