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

[Adrian Chadd]

Damnit, I commited the wrong file. I meant if_ath.c instead of if_ath_tx.c.

Thanks for pointing it out.



Adrian

On 10 November 2012 16:34, Adrian Chadd <adrian at freebsd.org> wrote:
> Author: adrian
> Date: Sun Nov 11 00:34:10 2012
> New Revision: 242881
> URL: http://svnweb.freebsd.org/changeset/base/242881
>
> Log:
>   Don't call av_set_tim() if it's NULL.
>
>   This happens during a scan in STA mode; any queued data frames will
>   be power save queued but as there's no TIM in STA mode, it panics.
>
>   This was introduced by me when I disabled my driver-aware power save
>   handling support.
>
> 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        Sat Nov 10 22:37:06 2012        (r242880)
> +++ head/sys/dev/ath/if_ath_tx.c        Sun Nov 11 00:34:10 2012        (r242881)
> @@ -1236,6 +1236,8 @@ ath_tx_setds(struct ath_softc *sc, struc
>         struct ath_desc *ds = bf->bf_desc;
>         struct ath_hal *ah = sc->sc_ah;
>
> +       bzero(bf->bf_desc, sc->sc_tx_desclen * bf->bf_nseg);
> +
>         ath_hal_setuptxdesc(ah, ds
>                 , bf->bf_state.bfs_pktlen       /* packet length */
>                 , bf->bf_state.bfs_hdrlen       /* header length */