[src/trunk]: src/sys/dev/pci/ixgbe Fix a bug that manual setting of 10GBASE-S...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e2eb2360fe3c
branches:  trunk
changeset: 999029:e2eb2360fe3c
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon May 13 05:04:17 2019 +0000

description:
Fix a bug that manual setting of 10GBASE-SR or 10GBASE-CX4 didn't work
if IFM_ETH_XTYPE was set. We don't use IFM_ETH_XTYPE macro, so this was not a
real bug.

diffstat:

 sys/dev/pci/ixgbe/ixgbe.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (23 lines):

diff -r bfc4a9a9e194 -r e2eb2360fe3c sys/dev/pci/ixgbe/ixgbe.c
--- a/sys/dev/pci/ixgbe/ixgbe.c Mon May 13 04:11:04 2019 +0000
+++ b/sys/dev/pci/ixgbe/ixgbe.c Mon May 13 05:04:17 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.180 2019/05/10 02:56:08 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.181 2019/05/13 05:04:17 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -2940,10 +2940,9 @@
        case IFM_10G_LRM:
        case IFM_10G_LR:
        case IFM_10G_TWINAX:
-#ifndef IFM_ETH_XTYPE
-       case IFM_10G_SR: /* KR, too */
-       case IFM_10G_CX4: /* KX4 */
-#else
+       case IFM_10G_SR:
+       case IFM_10G_CX4:
+#ifdef IFM_ETH_XTYPE
        case IFM_10G_KR:
        case IFM_10G_KX4:
 #endif