From owner-svn-src-user@FreeBSD.ORG  Fri Apr 23 02:17:23 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 273D11065672;
	Fri, 23 Apr 2010 02:17:23 +0000 (UTC)
	(envelope-from jmallett@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1737C8FC16;
	Fri, 23 Apr 2010 02:17:23 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o3N2HMEK061696;
	Fri, 23 Apr 2010 02:17:22 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o3N2HMbg061694;
	Fri, 23 Apr 2010 02:17:22 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201004230217.o3N2HMbg061694@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Fri, 23 Apr 2010 02:17:22 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r207092 - user/jmallett/octeon/sys/mips/cavium/octe
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Apr 2010 02:17:23 -0000

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],