Date: Tue, 8 Jan 2013 07:25:30 +0000 (UTC) From: Bryan Venteicher <bryanv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r245158 - projects/vmxnet/sys/dev/vmware/vmxnet Message-ID: <201301080725.r087PU4d066144@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301080725.r087PU4d066144>