From owner-svn-src-head@FreeBSD.ORG Mon Apr 21 02:05:51 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DE62FFE6; Mon, 21 Apr 2014 02:05:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id CA43F1C0A; Mon, 21 Apr 2014 02:05:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3L25p1E064241; Mon, 21 Apr 2014 02:05:51 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3L25p9U064240; Mon, 21 Apr 2014 02:05:51 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201404210205.s3L25p9U064240@svn.freebsd.org> From: Adrian Chadd Date: Mon, 21 Apr 2014 02:05:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264710 - head/sys/dev/ath X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 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, 21 Apr 2014 02:05:51 -0000 Author: adrian Date: Mon Apr 21 02:05:51 2014 New Revision: 264710 URL: http://svnweb.freebsd.org/changeset/base/264710 Log: Make sure bf_next is NULL'ed out when we're completing up an aggregate frame through the cleanup path. Whilst here, fix the indenting for something I messed up. Tested: * AR5416, STA mode Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c ============================================================================== --- head/sys/dev/ath/if_ath_tx.c Mon Apr 21 02:04:37 2014 (r264709) +++ head/sys/dev/ath/if_ath_tx.c Mon Apr 21 02:05:51 2014 (r264710) @@ -4600,10 +4600,11 @@ ath_tx_comp_cleanup_aggr(struct ath_soft ATH_TX_UNLOCK(sc); - /* Handle frame completion */ + /* Handle frame completion as individual frames */ bf = bf_first; while (bf) { bf_next = bf->bf_next; + bf->bf_next = NULL; ath_tx_default_comp(sc, bf, 1); bf = bf_next; } @@ -5849,7 +5850,7 @@ ath_tx_node_reassoc(struct ath_softc *sc ":", i); /* - * In case there's a followup call to this, only call it + * In case there's a followup call to this, only call it * if we don't have a cleanup in progress. */ if (! tid->cleanup_inprogress) {