summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmallett <jmallett@FreeBSD.org>2010-03-05 22:44:49 +0000
committerjmallett <jmallett@FreeBSD.org>2010-03-05 22:44:49 +0000
commitf1bff6675feb2d926b9bd1b153e1fcab9884eb1e (patch)
tree37c0ab7d39ce2b4456a9e4e7c966579cc749fb0c
parenta2ef6b30075fc20f91a4ebf4cbbd63da1d1bdecf (diff)
downloadFreeBSD-src-f1bff6675feb2d926b9bd1b153e1fcab9884eb1e.zip
FreeBSD-src-f1bff6675feb2d926b9bd1b153e1fcab9884eb1e.tar.gz
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
-rw-r--r--sys/mips/cavium/dev/rgmii/octeon_rgmx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/mips/cavium/dev/rgmii/octeon_rgmx.c b/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
index 53365cc..ef92091 100644
--- a/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
+++ b/sys/mips/cavium/dev/rgmii/octeon_rgmx.c
@@ -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:
OpenPOWER on IntegriCloud