From owner-svn-src-head@FreeBSD.ORG  Sun Mar 13 08:34:15 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 40EF6106566C;
	Sun, 13 Mar 2011 08:34: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 2DFF58FC14;
	Sun, 13 Mar 2011 08:34:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2D8YF6K047171;
	Sun, 13 Mar 2011 08:34:15 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2D8YFEU047168;
	Sun, 13 Mar 2011 08:34:15 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201103130834.p2D8YFEU047168@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 13 Mar 2011 08:34:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219590 - head/sys/mips/atheros
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Mar 2011 08:34:15 -0000

Author: adrian
Date: Sun Mar 13 08:34:14 2011
New Revision: 219590
URL: http://svn.freebsd.org/changeset/base/219590

Log:
  Fix the TX underrun status reset; remove a now unused variable.
  
  Submitted by: Luiz Otavio O Souza

Modified:
  head/sys/mips/atheros/if_arge.c
  head/sys/mips/atheros/if_argevar.h

Modified: head/sys/mips/atheros/if_arge.c
==============================================================================
--- head/sys/mips/atheros/if_arge.c	Sun Mar 13 08:28:21 2011	(r219589)
+++ head/sys/mips/atheros/if_arge.c	Sun Mar 13 08:34:14 2011	(r219590)
@@ -1424,7 +1424,6 @@ arge_tx_ring_init(struct arge_softc *sc)
 	sc->arge_cdata.arge_tx_prod = 0;
 	sc->arge_cdata.arge_tx_cons = 0;
 	sc->arge_cdata.arge_tx_cnt = 0;
-	sc->arge_cdata.arge_tx_pkts = 0;
 
 	rd = &sc->arge_rdata;
 	bzero(rd->arge_tx_ring, sizeof(rd->arge_tx_ring));
@@ -1784,7 +1783,7 @@ arge_intr(void *arg)
 	 */
 	if (status & DMA_INTR_TX_UNDERRUN) {
 		ARGE_WRITE(sc, AR71XX_DMA_TX_STATUS, DMA_TX_STATUS_UNDERRUN);
-		if (sc->arge_cdata.arge_tx_pkts > 0 ) {
+		if (sc->arge_cdata.arge_tx_cnt > 0 ) {
 			ARGE_WRITE(sc, AR71XX_DMA_TX_CONTROL, 
 			    DMA_TX_CONTROL_EN);
 		}

Modified: head/sys/mips/atheros/if_argevar.h
==============================================================================
--- head/sys/mips/atheros/if_argevar.h	Sun Mar 13 08:28:21 2011	(r219589)
+++ head/sys/mips/atheros/if_argevar.h	Sun Mar 13 08:34:14 2011	(r219590)
@@ -110,7 +110,6 @@ struct arge_chain_data {
 	bus_dmamap_t		arge_tx_ring_map;
 	bus_dmamap_t		arge_rx_ring_map;
 	bus_dmamap_t		arge_rx_sparemap;
-	int			arge_tx_pkts;
 	int			arge_tx_prod;
 	int			arge_tx_cons;
 	int			arge_tx_cnt;