From owner-svn-src-projects@FreeBSD.ORG  Tue Jan  8 07:25:30 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 646C5862;
 Tue,  8 Jan 2013 07:25:30 +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 56967F1B;
 Tue,  8 Jan 2013 07:25:30 +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 r087PU9Z066145;
 Tue, 8 Jan 2013 07:25:30 GMT (envelope-from bryanv@svn.freebsd.org)
Received: (from bryanv@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r087PU4d066144;
 Tue, 8 Jan 2013 07:25:30 GMT (envelope-from bryanv@svn.freebsd.org)
Message-Id: <201301080725.r087PU4d066144@svn.freebsd.org>
From: Bryan Venteicher <bryanv@FreeBSD.org>
Date: Tue, 8 Jan 2013 07:25:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r245158 - 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: Tue, 08 Jan 2013 07:25:30 -0000

Author: bryanv
Date: Tue Jan  8 07:25:29 2013
New Revision: 245158
URL: http://svnweb.freebsd.org/changeset/base/245158

Log:
  Slightly simplify vic_get_lladdr()
  
  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	Tue Jan  8 06:59:27 2013	(r245157)
+++ projects/vmxnet/sys/dev/vmware/vmxnet/if_vic.c	Tue Jan  8 07:25:29 2013	(r245158)
@@ -1811,14 +1811,15 @@ vic_get_lladdr(struct vic_softc *sc)
 	uint32_t r;
 
 	r = (sc->vic_cap & VIC_CMD_HWCAP_VPROM) ? VIC_VPROM : VIC_LLADDR;
+	r += sc->vic_ioadj;
 
-	bus_space_barrier(sc->vic_iot, sc->vic_ioh, r + sc->vic_ioadj,
-	    ETHER_ADDR_LEN, BUS_SPACE_BARRIER_READ);
-	bus_space_read_region_1(sc->vic_iot, sc->vic_ioh, r + sc->vic_ioadj,
-	    sc->vic_lladdr, ETHER_ADDR_LEN);
+	bus_space_barrier(sc->vic_iot, sc->vic_ioh, r, ETHER_ADDR_LEN,
+	    BUS_SPACE_BARRIER_READ);
+	bus_space_read_region_1(sc->vic_iot, sc->vic_ioh, r, sc->vic_lladdr,
+	    ETHER_ADDR_LEN);
 
 	/* Update the MAC address register. */
-	if (r == VIC_VPROM)
+	if (sc->vic_cap & VIC_CMD_HWCAP_VPROM)
 		vic_set_lladdr(sc);
 }