From owner-svn-src-all@FreeBSD.ORG Tue Mar 19 17:54:38 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id D183E599; Tue, 19 Mar 2013 17:54:38 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id C444C9E3; Tue, 19 Mar 2013 17:54:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JHscF9081677; Tue, 19 Mar 2013 17:54:38 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JHsci5081676; Tue, 19 Mar 2013 17:54:38 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201303191754.r2JHsci5081676@svn.freebsd.org> From: Adrian Chadd Date: Tue, 19 Mar 2013 17:54:38 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248527 - head/sys/dev/ath X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Mar 2013 17:54:38 -0000 Author: adrian Date: Tue Mar 19 17:54:37 2013 New Revision: 248527 URL: http://svnweb.freebsd.org/changeset/base/248527 Log: Now that the tx map field is correctly populated for both edma and legacy chips, just use that. Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c ============================================================================== --- head/sys/dev/ath/if_ath_tx.c Tue Mar 19 17:13:47 2013 (r248526) +++ head/sys/dev/ath/if_ath_tx.c Tue Mar 19 17:54:37 2013 (r248527) @@ -384,14 +384,11 @@ ath_tx_chaindesclist(struct ath_softc *s */ /* - * For now the HAL doesn't implement halNumTxMaps for non-EDMA - * (ie it's 0.) So just work around it. - * - * XXX TODO: populate halNumTxMaps for each HAL chip and - * then undo this hack. + * We need the number of TX data pointers in each descriptor. + * EDMA and later chips support 4 TX buffers per descriptor; + * previous chips just support one. */ - if (sc->sc_ah->ah_magic == 0x19741014) - numTxMaps = 4; + numTxMaps = sc->sc_tx_nmaps; /* * For EDMA and later chips ensure the TX map is fully populated