diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2011-10-04 20:17:43 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2011-10-04 20:17:43 +0000 |
| commit | 4699b5e472d01d978f94b07152af2fa169146d4b (patch) | |
| tree | 3c4db05f9483934a4daafed483064f428ebfedc5 /sys/mips/cavium/octe/ethernet-common.c | |
| parent | 5da3eb94fc6c44f333b318c7fd5cd37efea3a7d3 (diff) | |
Remove octeon_bootinfo from all files except octeon_machdep.c.
Use instead cvmx_sysinfo_get() consistently.
Reviewed by: jmallett, marcel
Obtained from: Juniper Networks, Inc
Author: Andrew Duane
Notes
Notes:
svn path=/head/; revision=226024
Diffstat (limited to 'sys/mips/cavium/octe/ethernet-common.c')
| -rw-r--r-- | sys/mips/cavium/octe/ethernet-common.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/mips/cavium/octe/ethernet-common.c b/sys/mips/cavium/octe/ethernet-common.c index 73103cc4725a..839b6f82ecee 100644 --- a/sys/mips/cavium/octe/ethernet-common.c +++ b/sys/mips/cavium/octe/ethernet-common.c @@ -45,7 +45,6 @@ __FBSDID("$FreeBSD$"); #include "ethernet-headers.h" extern int octeon_is_simulation(void); -extern cvmx_bootinfo_t *octeon_bootinfo; /** @@ -270,12 +269,12 @@ void cvm_oct_common_poll(struct ifnet *ifp) int cvm_oct_common_init(struct ifnet *ifp) { char mac[6] = { - octeon_bootinfo->mac_addr_base[0], - octeon_bootinfo->mac_addr_base[1], - octeon_bootinfo->mac_addr_base[2], - octeon_bootinfo->mac_addr_base[3], - octeon_bootinfo->mac_addr_base[4], - octeon_bootinfo->mac_addr_base[5] }; + cvmx_sysinfo_get()->mac_addr_base[0], + cvmx_sysinfo_get()->mac_addr_base[1], + cvmx_sysinfo_get()->mac_addr_base[2], + cvmx_sysinfo_get()->mac_addr_base[3], + cvmx_sysinfo_get()->mac_addr_base[4], + cvmx_sysinfo_get()->mac_addr_base[5] }; cvm_oct_private_t *priv = (cvm_oct_private_t *)ifp->if_softc; mac[5] += cvm_oct_mac_addr_offset++; |