From owner-svn-src-projects@FreeBSD.ORG  Mon Jan 14 04:30:22 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 0E76B9B3;
 Mon, 14 Jan 2013 04:30:22 +0000 (UTC)
 (envelope-from bryanv@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 DD5D0F1;
 Mon, 14 Jan 2013 04:30:21 +0000 (UTC)
Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0E4ULmU028147;
 Mon, 14 Jan 2013 04:30:21 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0E4ULTr028146;
 Mon, 14 Jan 2013 04:30:21 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201301140430.r0E4ULTr028146@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Mon, 14 Jan 2013 04:30:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245403 - projects/vmxnet/sys/dev/vmware/vmxnet
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 Jan 2013 04:30:22 -0000

Author: bryanv
Date: Mon Jan 14 04:30:21 2013
New Revision: 245403
URL: http://svnweb.freebsd.org/changeset/base/245403

Log:
  ASSET we do not over or under run the shared allocation region
  
  Approved by:	grehan (implicit)

Modified:
  projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c

Modified: projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c
==============================================================================
--- projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 01:15:25 2013	(r245402)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Mon Jan 14 04:30:21 2013	(r245403)
@@ -481,7 +481,7 @@ static void
 vic_init_shared_mem(struct vic_softc *sc)
 {
 	uint8_t *kva;
-	u_int offset;
+	size_t offset;
 	int q;
 
 	kva = sc->vic_dma_kva;
@@ -504,6 +504,10 @@ vic_init_shared_mem(struct vic_softc *sc
 	sc->vic_data->vd_tx_offset = offset;
 	sc->vic_data->vd_tx_length = sc->vic_tx_nbufs;
 
+	offset += sc->vic_tx_nbufs * sizeof(struct vic_txdesc);
+	KASSERT(offset == sc->vic_dma_size, ("%s: incorrect offset %zu/%zu",
+	    __func__, offset, sc->vic_dma_size));
+
 	if (sc->vic_flags & VIC_FLAGS_TSO)
 		sc->vic_data->vd_tx_maxfrags = VIC_TSO_MAXSEGS;
 	else