From owner-svn-src-all@FreeBSD.ORG  Thu Sep  2 00:44:05 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 75D321065792;
	Thu,  2 Sep 2010 00:44:05 +0000 (UTC)
	(envelope-from yongari@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 49E5A8FC20;
	Thu,  2 Sep 2010 00:44:05 +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 o820i5pJ086575;
	Thu, 2 Sep 2010 00:44:05 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o820i53s086573;
	Thu, 2 Sep 2010 00:44:05 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201009020044.o820i53s086573@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Thu, 2 Sep 2010 00:44:05 +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: r212124 - head/sys/dev/sis
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 02 Sep 2010 00:44:05 -0000

Author: yongari
Date: Thu Sep  2 00:44:05 2010
New Revision: 212124
URL: http://svn.freebsd.org/changeset/base/212124

Log:
  Fix stupid error in r212109 which didn't swap DMA maps. This caused
  IOMMU panic on sparc64 under high TX load.

Modified:
  head/sys/dev/sis/if_sis.c

Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c	Wed Sep  1 23:51:07 2010	(r212123)
+++ head/sys/dev/sis/if_sis.c	Thu Sep  2 00:44:05 2010	(r212124)
@@ -1883,8 +1883,8 @@ sis_encap(struct sis_softc *sc, struct m
 
 	/* Swap the last and the first dmamaps. */
 	map = txd->tx_dmamap;
-	txd->tx_dmamap = sc->sis_txdesc[frag].tx_dmamap;
-	sc->sis_txdesc[frag].tx_dmamap = map;
+	txd->tx_dmamap = sc->sis_txdesc[prod].tx_dmamap;
+	sc->sis_txdesc[prod].tx_dmamap = map;
 	txd->tx_m = *m_head;
 
 	return (0);