Date: Sun, 20 Apr 2014 19:09:33 -0700 From: Adrian Chadd <adrian@freebsd.org> To: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r264710 - head/sys/dev/ath Message-ID: <CAJ-Vmo=Fzt7RtRfEidQ3vo_vFmc6W6M%2BWXR6pV1%2B8bR4Rus8uA@mail.gmail.com> In-Reply-To: <201404210205.s3L25p9U064240@svn.freebsd.org> References: <201404210205.s3L25p9U064240@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <adrian@freebsd.org> 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) { >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-Vmo=Fzt7RtRfEidQ3vo_vFmc6W6M%2BWXR6pV1%2B8bR4Rus8uA>