From owner-svn-src-all@FreeBSD.ORG  Sun Dec 18 17:48:54 2011
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 B93491065678;
	Sun, 18 Dec 2011 17:48:54 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A824E8FC0A;
	Sun, 18 Dec 2011 17:48:54 +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 pBIHmspP019306;
	Sun, 18 Dec 2011 17:48:54 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id pBIHms2f019304;
	Sun, 18 Dec 2011 17:48:54 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201112181748.pBIHms2f019304@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sun, 18 Dec 2011 17:48:54 +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: r228694 - head/sys/dev/netmap
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: Sun, 18 Dec 2011 17:48:54 -0000

Author: marius
Date: Sun Dec 18 17:48:54 2011
New Revision: 228694
URL: http://svn.freebsd.org/changeset/base/228694

Log:
  Fix compilation on sparc64 by actually supplying the bus_dma_tag_t member
  of the rx_ring to bus_dmamap_sync(9). Given that netmap code tries to
  obtain the bus addresses of netmap buffers via vtophys(9) instead of using
  bus_dma(9) it currently has zero chance of actually working on sparc64
  though (and for that matter f.e. also not with MACs limited to 32-bit DMA
  on x86 machines with more than 4GB of RAM).

Modified:
  head/sys/dev/netmap/if_em_netmap.h

Modified: head/sys/dev/netmap/if_em_netmap.h
==============================================================================
--- head/sys/dev/netmap/if_em_netmap.h	Sun Dec 18 17:42:26 2011	(r228693)
+++ head/sys/dev/netmap/if_em_netmap.h	Sun Dec 18 17:48:54 2011	(r228694)
@@ -329,7 +329,7 @@ em_netmap_rxsync(void *a, u_int ring_nr,
 		if ((curr->status & E1000_RXD_STAT_DD) == 0)
 			break;
 		ring->slot[j].len = le16toh(curr->length);
-		bus_dmamap_sync(rxr->tag, rxr->rx_buffers[l].map,
+		bus_dmamap_sync(rxr->rxtag, rxr->rx_buffers[l].map,
 			BUS_DMASYNC_POSTREAD);
 		j = (j == lim) ? 0 : j + 1;
 		/* make sure next_to_refresh follows next_to_check */