From owner-svn-src-user@FreeBSD.ORG Wed Aug 3 07:44:15 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 A040010656DA; Wed, 3 Aug 2011 07:44:15 +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 769BF8FC17; Wed, 3 Aug 2011 07:44:15 +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 p737iFlQ092004; Wed, 3 Aug 2011 07:44:15 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p737iFfm092001; Wed, 3 Aug 2011 07:44:15 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201108030744.p737iFfm092001@svn.freebsd.org> From: Adrian Chadd Date: Wed, 3 Aug 2011 07:44:15 +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: r224627 - 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, 03 Aug 2011 07:44:15 -0000 Author: adrian Date: Wed Aug 3 07:44:15 2011 New Revision: 224627 URL: http://svn.freebsd.org/changeset/base/224627 Log: Remove a now unused function Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h 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 3 07:36:10 2011 (r224626) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.c Wed Aug 3 07:44:15 2011 (r224627) @@ -1743,52 +1743,6 @@ ath_tx_tid_hw_queue_norm(struct ath_soft } /* - * Attempt to schedule packets from the given node to the hardware. - */ -void -ath_tx_hw_queue(struct ath_softc *sc, struct ath_node *an) -{ -#if 0 - struct ath_tid *atid; - int tid; - int isempty; - - /* - * For now, just queue from all TIDs in order. - * This is very likely absolutely wrong from a QoS - * perspective but it'll do for now. - */ - for (tid = 0; tid < IEEE80211_TID_SIZE; tid++) { - atid = &an->an_tid[tid]; - if (ath_tx_ampdu_pending(sc, an, tid)) { - continue; - } - if (ath_tx_ampdu_running(sc, an, tid)) - ath_tx_tid_hw_queue_aggr(sc, an, tid); - else - ath_tx_tid_hw_queue_norm(sc, an, tid); - - /* - * Check if anything is left in the queue; - * if not, unschedule it. - * Checking this only requires the TXQ lock. - * Unscheduling it requires all the locks. - */ - ATH_TXQ_LOCK(atid); - isempty = (atid->axq_depth == 0); - if (isempty) { - ATH_TXNODE_LOCK(sc); - ATH_NODE_LOCK(an); - ath_tx_node_unsched(sc, an, tid); - ATH_NODE_UNLOCK(an); - ATH_TXNODE_UNLOCK(sc); - } - ATH_TXQ_UNLOCK(atid); - } -#endif -} - -/* * Schedule some packets to the given hardware queue. * * This function walks the list of TIDs (ie, ath_node TIDs Modified: user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h ============================================================================== --- user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h Wed Aug 3 07:36:10 2011 (r224626) +++ user/adrian/if_ath_tx/sys/dev/ath/if_ath_tx.h Wed Aug 3 07:44:15 2011 (r224627) @@ -51,7 +51,6 @@ extern void ath_tx_tid_hw_queue_aggr(str int tid); extern void ath_tx_tid_hw_queue_norm(struct ath_softc *sc, struct ath_node *an, int tid); -extern void ath_tx_hw_queue(struct ath_softc *sc, struct ath_node *an); extern void ath_txq_sched(struct ath_softc *sc, struct ath_txq *txq); /* TX addba handling */