Date: Tue, 6 Sep 2011 05:06:49 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r225413 - user/adrian/if_ath_tx/sys/dev/ath Message-ID: <201109060506.p8656nwc069248@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Tue Sep 6 05:06:49 2011 New Revision: 225413 URL: http://svn.freebsd.org/changeset/base/225413 Log: Two fixes: * Clarify the software queue handling a little better; * Don't add a frame to the BAW if it's not in the BAW - specifically, NULL frames. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c 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 Tue Sep 6 03:17:11 2011 (r225412) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Tue Sep 6 05:06:49 2011 (r225413) @@ -2032,8 +2032,10 @@ ath_tx_xmit_aggr(struct ath_softc *sc, s tid->hwq_depth++; /* Add to BAW */ - ath_tx_addto_baw(sc, an, tid, bf); - bf->bf_state.bfs_addedbaw = 1; + if (bf->bf_state.bfs_dobaw) { + ath_tx_addto_baw(sc, an, tid, bf); + bf->bf_state.bfs_addedbaw = 1; + } /* Set completion handler, multi-frame aggregate or not */ bf->bf_comp = ath_tx_aggr_comp; @@ -2085,10 +2087,14 @@ ath_tx_swq(struct ath_softc *sc, struct } else if (ath_tx_ampdu_pending(sc, an, tid)) { /* AMPDU pending; queue */ ATH_TXQ_INSERT_TAIL(atid, bf, bf_list); - } else if (txq->axq_depth < sc->sc_hwq_limit && - ath_tx_ampdu_running(sc, an, tid)) { - /* AMPDU running, attempt direct dispatch */ - ath_tx_xmit_aggr(sc, an, bf); + } else if (ath_tx_ampdu_running(sc, an, tid)) { + /* AMPDU running, attempt direct dispatch if possible */ + if (txq->axq_depth < sc->sc_hwq_limit) + ath_tx_xmit_aggr(sc, an, bf); + else { + ATH_TXQ_INSERT_TAIL(atid, bf, bf_list); + ath_tx_tid_sched(sc, an, atid); + } } else if (txq->axq_depth < sc->sc_hwq_limit) { /* AMPDU not running, attempt direct dispatch */ ath_tx_xmit_normal(sc, txq, bf);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201109060506.p8656nwc069248>