From owner-svn-src-head@FreeBSD.ORG  Fri Sep  3 18:00:18 2010
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 2DE28106567A;
	Fri,  3 Sep 2010 18:00:18 +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 1CF1A8FC17;
	Fri,  3 Sep 2010 18:00:18 +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 o83I0I9K057687;
	Fri, 3 Sep 2010 18:00:18 GMT (envelope-from yongari@svn.freebsd.org)
Received: (from yongari@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o83I0Hh2057685;
	Fri, 3 Sep 2010 18:00:17 GMT (envelope-from yongari@svn.freebsd.org)
Message-Id: <201009031800.o83I0Hh2057685@svn.freebsd.org>
From: Pyun YongHyeon <yongari@FreeBSD.org>
Date: Fri, 3 Sep 2010 18:00:17 +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: r212185 - head/sys/dev/sis
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: Fri, 03 Sep 2010 18:00:18 -0000

Author: yongari
Date: Fri Sep  3 18:00:17 2010
New Revision: 212185
URL: http://svn.freebsd.org/changeset/base/212185

Log:
  Fix another bug introduced in r212109. We should unload DMA maps
  only after sending the last fragment of a frame so the mbuf pointer
  also should be stored in the last descriptor index.

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

Modified: head/sys/dev/sis/if_sis.c
==============================================================================
--- head/sys/dev/sis/if_sis.c	Fri Sep  3 17:42:17 2010	(r212184)
+++ head/sys/dev/sis/if_sis.c	Fri Sep  3 18:00:17 2010	(r212185)
@@ -1940,7 +1940,7 @@ sis_encap(struct sis_softc *sc, struct m
 	map = txd->tx_dmamap;
 	txd->tx_dmamap = sc->sis_txdesc[prod].tx_dmamap;
 	sc->sis_txdesc[prod].tx_dmamap = map;
-	txd->tx_m = *m_head;
+	sc->sis_txdesc[prod].tx_m = *m_head;
 
 	return (0);
 }