Date: Fri, 23 Apr 2010 02:17:22 +0000 (UTC) From: Juli Mallett <jmallett@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r207092 - user/jmallett/octeon/sys/mips/cavium/octe Message-ID: <201004230217.o3N2HMbg061694@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmallett Date: Fri Apr 23 02:17:22 2010 New Revision: 207092 URL: http://svn.freebsd.org/changeset/base/207092 Log: Since we don't treat the MAC address like a 64-bit word in this routine, don't prepend 2 bytes of 0 to it. Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-common.c Modified: user/jmallett/octeon/sys/mips/cavium/octe/ethernet-common.c ============================================================================== --- user/jmallett/octeon/sys/mips/cavium/octe/ethernet-common.c Fri Apr 23 02:05:34 2010 (r207091) +++ user/jmallett/octeon/sys/mips/cavium/octe/ethernet-common.c Fri Apr 23 02:17:22 2010 (r207092) @@ -156,7 +156,7 @@ static int cvm_oct_common_set_mac_addres uint8_t *ptr = addr; uint64_t mac = 0; for (i = 0; i < 6; i++) - mac = (mac<<8) | (uint64_t)(ptr[i+2]); + mac = (mac<<8) | (uint64_t)(ptr[i]); gmx_cfg.u64 = cvmx_read_csr(CVMX_GMXX_PRTX_CFG(index, interface)); cvmx_write_csr(CVMX_GMXX_PRTX_CFG(index, interface), gmx_cfg.u64 & ~1ull); @@ -233,7 +233,7 @@ static int cvm_oct_common_change_mtu(str int cvm_oct_common_init(struct ifnet *ifp) { static int count; - char mac[8] = {0x00, 0x00, + char mac[6] = { octeon_bootinfo->mac_addr_base[0], octeon_bootinfo->mac_addr_base[1], octeon_bootinfo->mac_addr_base[2],
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004230217.o3N2HMbg061694>