Module Name: src
Committed By: simonb
Date: Fri May 14 13:36:28 UTC 2021
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_gmx.c
Log Message:
Fix a missed bitmask to __SHIFTOUT conversion in rev 1.12.
Fixes negotiation problems on non-gige switches. Problem discovered and
tested by riastradh@.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/mips/cavium/dev/octeon_gmx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.18 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.19
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.18 Wed May 5 06:47:29 2021
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Fri May 14 13:36:28 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.18 2021/05/05 06:47:29 simonb Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.19 2021/05/14 13:36:28 simonb Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.18 2021/05/05 06:47:29 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.19 2021/05/14 13:36:28 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -834,7 +834,7 @@ octgmx_rgmii_speed_speed(struct octgmx_p
prt_cfg = _GMX_PORT_RD8(sc, GMX0_PRT0_CFG);
- switch (sc->sc_link & RXN_RX_INBND_SPEED) {
+ switch (__SHIFTOUT(sc->sc_link, RXN_RX_INBND_SPEED)) {
case RXN_RX_INBND_SPEED_2_5:
/* 10Mbps */
/*
