Date: Wed, 17 Aug 2011 09:06:06 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r224931 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201108170906.p7H966Qf095413@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Wed Aug 17 09:06:05 2011 New Revision: 224931 URL: http://svn.freebsd.org/changeset/base/224931 Log: * Fix a busted locking call I just introduced * Fix a potential LOR when fiddling with the mcastq/cabq Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Aug 17 09:02:58 2011 (r224930) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Aug 17 09:06:05 2011 (r224931) @@ -2653,8 +2653,8 @@ ath_beacon_generate(struct ath_softc *sc } /* NB: gated by beacon so safe to start here */ ath_hal_txstart(ah, cabq->axq_qnum); - ATH_TXQ_UNLOCK(cabq); ATH_TXQ_UNLOCK(&avp->av_mcastq); + ATH_TXQ_UNLOCK(cabq); } return bf; } Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 17 09:02:58 2011 (r224930) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 17 09:06:05 2011 (r224931) @@ -2323,7 +2323,7 @@ ath_tx_comp_aggr_error(struct ath_softc ATH_TXQ_INSERT_HEAD(tid, bf, bf_list); STAILQ_REMOVE_HEAD(&bf_q, bf_list); } - ATH_TXQ_LOCK(tid); + ATH_TXQ_UNLOCK(tid); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108170906.p7H966Qf095413>