Source-Changes-HG archive

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

[src/trunk]: src/sys/dev/pci We now have IFM_2500_KX and IFM_1000_KX, so use ...



details:   https://anonhg.NetBSD.org/src/rev/0bacd6df8af7
branches:  trunk
changeset: 448352:0bacd6df8af7
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Jan 31 05:48:32 2019 +0000

description:
We now have IFM_2500_KX and IFM_1000_KX, so use them.

diffstat:

 sys/dev/pci/if_wm.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (30 lines):

diff -r 2ebf477517c6 -r 0bacd6df8af7 sys/dev/pci/if_wm.c
--- a/sys/dev/pci/if_wm.c       Thu Jan 31 05:25:48 2019 +0000
+++ b/sys/dev/pci/if_wm.c       Thu Jan 31 05:48:32 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_wm.c,v 1.621 2019/01/31 05:20:49 msaitoh Exp $      */
+/*     $NetBSD: if_wm.c,v 1.622 2019/01/31 05:48:32 msaitoh Exp $      */
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -83,7 +83,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.621 2019/01/31 05:20:49 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.622 2019/01/31 05:48:32 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -12186,9 +12186,9 @@
                status = CSR_READ(sc, WMREG_STATUS);
                if (((status & STATUS_2P5_SKU) != 0)
                    && ((status & STATUS_2P5_SKU_OVER) == 0)) {
-                       ifmr->ifm_active |= IFM_2500_SX; /* XXX KX */
+                       ifmr->ifm_active |= IFM_2500_KX;
                } else
-                       ifmr->ifm_active |= IFM_1000_SX; /* XXX KX */
+                       ifmr->ifm_active |= IFM_1000_KX;
        } else {
                switch (__SHIFTOUT(reg, PCS_LSTS_SPEED)) {
                case PCS_LSTS_SPEED_10:



Home | Main Index | Thread Index | Old Index