From owner-svn-src-user@FreeBSD.ORG Wed Aug 17 15:45:41 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 28DDD106566B; Wed, 17 Aug 2011 15:45:41 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id F2D898FC08; Wed, 17 Aug 2011 15:45:40 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7HFjebf011984; Wed, 17 Aug 2011 15:45:40 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7HFjeW2011982; Wed, 17 Aug 2011 15:45:40 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108171545.p7HFjeW2011982@svn.freebsd.org> From: Adrian Chadd Date: Wed, 17 Aug 2011 15:45:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224947 - user/adrian/if_ath_tx/sys/dev/ath X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Aug 2011 15:45:41 -0000 Author: adrian Date: Wed Aug 17 15:45:40 2011 New Revision: 224947 URL: http://svn.freebsd.org/changeset/base/224947 Log: Fix some BAW brokenness introduced by previous commits. The BAW tracking was completely broken. ath_tx_swq() was blanking the BAW flag in the ath_buf, thus no frames were ever thrown into the BAW tracking code. This restores the BAW tracking functionality but there's again a race between the pre-ADDBA sequence numbers and the post-ADDBA BAW. I'll look into this and fix it in a subsequent commit. 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 Wed Aug 17 15:24:25 2011 (r224946) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 17 15:45:40 2011 (r224947) @@ -1097,6 +1097,8 @@ ath_tx_start(struct ath_softc *sc, struc txq = &avp->av_mcastq; /* Do the generic frame setup */ + /* XXX should just bzero the bf_state? */ + bf->bf_state.bfs_dobaw = 0; /* A-MPDU TX? Manually set sequence number */ /* Don't do it whilst pending; the net80211 layer still assigns them */ @@ -1247,6 +1249,10 @@ ath_tx_raw_start(struct ath_softc *sc, s /* packet header may have moved, reset our local pointer */ wh = mtod(m0, struct ieee80211_frame *); + /* Do the generic frame setup */ + /* XXX should just bzero the bf_state? */ + bf->bf_state.bfs_dobaw = 0; + error = ath_tx_dmasetup(sc, bf, m0); if (error != 0) return error; @@ -1780,7 +1786,6 @@ ath_tx_swq(struct ath_softc *sc, struct bf->bf_state.bfs_tid = tid; bf->bf_state.bfs_txq = txq; bf->bf_state.bfs_pri = pri; - bf->bf_state.bfs_dobaw = 0; bf->bf_state.bfs_aggr = 0; bf->bf_state.bfs_aggrburst = 0; @@ -2581,6 +2586,7 @@ ath_tx_tid_hw_queue_aggr(struct ath_soft "%s: seq %d outside of %d/%d; waiting\n", __func__, SEQNO(bf->bf_state.bfs_seqno), tap->txa_start, tap->txa_wnd); + ATH_TXQ_UNLOCK(atid); break; }