From owner-svn-src-user@FreeBSD.ORG  Sat Feb 27 06:28: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 18BCD1065670;
	Sat, 27 Feb 2010 06:28: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 085118FC12;
	Sat, 27 Feb 2010 06:28: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 o1R6SMjl078418;
	Sat, 27 Feb 2010 06:28:22 GMT
	(envelope-from jmallett@svn.freebsd.org)
Received: (from jmallett@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1R6SMVE078416;
	Sat, 27 Feb 2010 06:28:22 GMT
	(envelope-from jmallett@svn.freebsd.org)
Message-Id: <201002270628.o1R6SMVE078416@svn.freebsd.org>
From: Juli Mallett <jmallett@FreeBSD.org>
Date: Sat, 27 Feb 2010 06:28: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: r204401 - user/jmallett/octeon/sys/mips/cavium/dev/rgmii
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: Sat, 27 Feb 2010 06:28:23 -0000

Author: jmallett
Date: Sat Feb 27 06:28:22 2010
New Revision: 204401
URL: http://svn.freebsd.org/changeset/base/204401

Log:
  o) Since typestr is always NULL don't bother printing it.
  o) Don't mask off the low byte of chipid -- some of the case statements are
     unreachable if you do that.  This fixes crashes on the CAM-0100 from trying
     to enumerate a 4th port that isn't there.

Modified:
  user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c

Modified: user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
==============================================================================
--- user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Sat Feb 27 05:55:04 2010	(r204400)
+++ user/jmallett/octeon/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Sat Feb 27 06:28:22 2010	(r204401)
@@ -136,7 +136,9 @@ struct rgmx_softc_dev {
 	u_int			idx;
         u_char                  ieee[6];
 
+#if 0
         char const * typestr;   /* printable name of the interface.  */
+#endif
         u_short txb_size;       /* size of TX buffer, in bytes  */
 
         /* Transmission buffer management.  */
@@ -350,7 +352,9 @@ static int octeon_rgmx_init_ifnet (struc
 
         ether_ifattach(sc->ifp, sc->ieee);
         /* Print additional info when attached.  */
+#if 0
         device_printf(sc->sc_dev, "type %s, full duplex\n", sc->typestr);
+#endif
 
         return (0);
 }
@@ -2181,7 +2185,7 @@ static int octeon_has_4ports (void)
     u_int chipid;
     int retcode = 1;
 
-    chipid = octeon_get_chipid() & 0xffffff00;
+    chipid = octeon_get_chipid();
 
     switch (chipid) {
         case OCTEON_CN31XX_CHIP: