From owner-svn-src-head@FreeBSD.ORG Mon Apr 21 02:09:34 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 E9F073A5; Mon, 21 Apr 2014 02:09:34 +0000 (UTC) Received: from mail-qa0-x230.google.com (mail-qa0-x230.google.com [IPv6:2607:f8b0:400d:c00::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 89A1D1C45; Mon, 21 Apr 2014 02:09:34 +0000 (UTC) Received: by mail-qa0-f48.google.com with SMTP id s7so3306582qap.7 for ; Sun, 20 Apr 2014 19:09:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:content-type; bh=97QBpPdGY9f08yQd0Ia5i9NwKDEH80d+KxWbj0NnrrU=; b=AtjD2lIdYVUNazCbsXz2Tppok0qofwJ2gyMdN6pcTVAhEIZ1pCHu/dFH4VLCJUNOZr +iJU0Rpzh4l1zSmAfGcrGfV7eEvPXZKcegzYNtXUVmgavLYsuR7tOHBUFWvDYBi7HxhT XePaRHg3bFADFpDdivtGOwJjcA9gbVjmflK9DDAvXILx47GvtRH360Bj0/m02Tlmiqze Ntpe0MaxS6hJu2/NuYHoZaCZyPjsrArPAhySZAuqMxgWSVn/326PRsphM0HuwauPUJOq GZdCUMdux89EbBxCbTg9NgnxCVjaA2phShN+FrKRgXiWcj8ESdlOvZDN6XyCbKis7oeh DGUw== MIME-Version: 1.0 X-Received: by 10.140.51.74 with SMTP id t68mr16726006qga.50.1398046173682; Sun, 20 Apr 2014 19:09:33 -0700 (PDT) Sender: adrian.chadd@gmail.com Received: by 10.224.191.201 with HTTP; Sun, 20 Apr 2014 19:09:33 -0700 (PDT) In-Reply-To: <201404210205.s3L25p9U064240@svn.freebsd.org> References: <201404210205.s3L25p9U064240@svn.freebsd.org> Date: Sun, 20 Apr 2014 19:09:33 -0700 X-Google-Sender-Auth: 5s6UC9TSbDobfDs9Ngj8IVGEb3g Message-ID: Subject: Re: svn commit: r264710 - head/sys/dev/ath From: Adrian Chadd To: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 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:09:35 -0000 I didn't say it in the commit message, but this should be MFCed to stable/10 . -a On 20 April 2014 19:05, Adrian Chadd wrote: > 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) { >