From owner-svn-src-user@FreeBSD.ORG Wed Oct 26 13:52:24 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 D03EC106564A; Wed, 26 Oct 2011 13:52:24 +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 C06F18FC12; Wed, 26 Oct 2011 13:52:24 +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 p9QDqOPv052695; Wed, 26 Oct 2011 13:52:24 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9QDqObG052692; Wed, 26 Oct 2011 13:52:24 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201110261352.p9QDqObG052692@svn.freebsd.org> From: Adrian Chadd Date: Wed, 26 Oct 2011 13:52:24 +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: r226789 - 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, 26 Oct 2011 13:52:24 -0000 Author: adrian Date: Wed Oct 26 13:52:24 2011 New Revision: 226789 URL: http://svn.freebsd.org/changeset/base/226789 Log: Remove the txq from the function decl for now, just to make this easier to do. The "real" solution is to do track this busy buf per-txq, as there's multiple data DMA queues on > AR5212. But that's a later problem to solve. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_misc.h Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath.c ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Oct 26 13:33:41 2011 (r226788) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath.c Wed Oct 26 13:52:24 2011 (r226789) @@ -4488,7 +4488,7 @@ ath_tx_update_ratectrl(struct ath_softc * of the buffers has been used. */ void -ath_tx_update_busy(struct ath_softc *sc, struct ath_txq *txq) +ath_tx_update_busy(struct ath_softc *sc) { struct ath_buf *last; @@ -4598,7 +4598,7 @@ ath_tx_processq(struct ath_softc *sc, st * not busy, as the hardware has now moved past * that "free" entry and onto the next one. */ - ath_tx_update_busy(sc, txq); + ath_tx_update_busy(sc); /* * Call the completion handler. Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_misc.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_misc.h Wed Oct 26 13:33:41 2011 (r226788) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_misc.h Wed Oct 26 13:52:24 2011 (r226789) @@ -63,7 +63,6 @@ extern void ath_tx_default_comp(struct a extern void ath_tx_update_ratectrl(struct ath_softc *sc, struct ieee80211_node *ni, struct ath_rc_series *rc, struct ath_tx_status *ts, int frmlen, int nframes, int nbad); -extern void ath_tx_update_busy(struct ath_softc *sc, struct ath_txq *txq); extern void ath_tx_freebuf(struct ath_softc *sc, struct ath_buf *bf, int status);