svn commit: r264710 - head/sys/dev/ath

[Adrian Chadd]

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 at 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) {
>