Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/mips/cavium/dev Fix a missed bitmask to __SHIFTOUT ...



details:   https://anonhg.NetBSD.org/src/rev/14bbbafac015
branches:  trunk
changeset: 1021179:14bbbafac015
user:      simonb <simonb%NetBSD.org@localhost>
date:      Fri May 14 13:36:28 2021 +0000

description:
Fix a missed bitmask to __SHIFTOUT conversion in rev 1.12.

Fixes negotiation problems on non-gige switches.  Problem discovered and
tested by riastradh@.

diffstat:

 sys/arch/mips/cavium/dev/octeon_gmx.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2f140c0b4e77 -r 14bbbafac015 sys/arch/mips/cavium/dev/octeon_gmx.c
--- a/sys/arch/mips/cavium/dev/octeon_gmx.c     Fri May 14 09:25:14 2021 +0000
+++ b/sys/arch/mips/cavium/dev/octeon_gmx.c     Fri May 14 13:36:28 2021 +0000
@@ -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 @@
 
        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 */
                /*



Home | Main Index | Thread Index | Old Index