From owner-svn-src-user@FreeBSD.ORG  Sun Sep 11 16:28:07 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 DB03D1065675;
	Sun, 11 Sep 2011 16:28:07 +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 CB3038FC14;
	Sun, 11 Sep 2011 16:28:07 +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 p8BGS7kG086136;
	Sun, 11 Sep 2011 16:28:07 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8BGS7xX086134;
	Sun, 11 Sep 2011 16:28:07 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201109111628.p8BGS7xX086134@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 11 Sep 2011 16:28:07 +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: r225478 - 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: Sun, 11 Sep 2011 16:28:07 -0000

Author: adrian
Date: Sun Sep 11 16:28:07 2011
New Revision: 225478
URL: http://svn.freebsd.org/changeset/base/225478

Log:
  Just add a little warning if NOACK tagged frames end up in an aggregate
  queue, and disable NOACK for now.
  
  I'll worry about fixing this up at some point in the future.

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

Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c
==============================================================================
--- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c	Sun Sep 11 16:20:59 2011	(r225477)
+++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx_ht.c	Sun Sep 11 16:28:07 2011	(r225478)
@@ -758,6 +758,17 @@ ath_tx_form_aggr(struct ath_softc *sc, s
 		 */
 
 		/*
+		 * XXX enforce ACK for aggregate frames (this needs to be
+		 * XXX handled more gracefully?
+		 */
+		if (bf->bf_state.bfs_flags & HAL_TXDESC_NOACK) {
+			device_printf(sc->sc_dev,
+			    "%s: HAL_TXDESC_NOACK set for an aggregate frame?\n",
+			    __func__);
+			bf->bf_state.bfs_flags &= (~HAL_TXDESC_NOACK);
+		}
+
+		/*
 		 * Add the now owned buffer (which isn't
 		 * on the software TXQ any longer) to our
 		 * aggregate frame list.