Module Name: src
Committed By: msaitoh
Date: Mon May 13 05:04:17 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.180 -r1.181 src/sys/dev/pci/ixgbe/ixgbe.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/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.180 src/sys/dev/pci/ixgbe/ixgbe.c:1.181
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.180 Fri May 10 02:56:08 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c Mon May 13 05:04:17 2019
@@ -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 @@ ixgbe_media_change(struct ifnet *ifp)
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
