svn commit: r204776 - head/sys/mips/cavium/dev/rgmii

Juli Mallett jmallett at FreeBSD.org
Fri Mar 5 22:44:50 UTC 2010


Author: jmallett
Date: Fri Mar  5 22:44:49 2010
New Revision: 204776
URL: http://svn.freebsd.org/changeset/base/204776

Log:
  Do not mask off the low byte of the chipid, it makes some of the case
  statements unreachable and seems to be wrong.  Fixes detection of the number
  of ports available on some models.
  
  Sponsored by:	Packet Forensics

Modified:
  head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c

Modified: head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
==============================================================================
--- head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Fri Mar  5 22:43:44 2010	(r204775)
+++ head/sys/mips/cavium/dev/rgmii/octeon_rgmx.c	Fri Mar  5 22:44:49 2010	(r204776)
@@ -2181,7 +2181,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:


More information about the svn-src-all mailing list