Module Name:    src
Committed By:   msaitoh
Date:           Wed Aug 28 08:23:35 UTC 2019

Modified Files:
        src/sys/dev/pci/ixgbe: ixgbe.c

Log Message:
X550EM supports QSFP, so check ixgbe_media_type_fiber_qsfp too.


To generate a diff of this commit:
cvs rdiff -u -r1.202 -r1.203 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.202 src/sys/dev/pci/ixgbe/ixgbe.c:1.203
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.202	Wed Aug 21 10:01:53 2019
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Wed Aug 28 08:23:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ixgbe.c,v 1.202 2019/08/21 10:01:53 msaitoh Exp $ */
+/* $NetBSD: ixgbe.c,v 1.203 2019/08/28 08:23:35 msaitoh Exp $ */
 
 /******************************************************************************
 
@@ -1489,6 +1489,8 @@ ixgbe_is_sfp(struct ixgbe_hw *hw)
 			return (TRUE);
 		return (FALSE);
 	case ixgbe_mac_82599EB:
+	case ixgbe_mac_X550EM_x:
+	case ixgbe_mac_X550EM_a:
 		switch (hw->mac.ops.get_media_type(hw)) {
 		case ixgbe_media_type_fiber:
 		case ixgbe_media_type_fiber_qsfp:
@@ -1496,11 +1498,6 @@ ixgbe_is_sfp(struct ixgbe_hw *hw)
 		default:
 			return (FALSE);
 		}
-	case ixgbe_mac_X550EM_x:
-	case ixgbe_mac_X550EM_a:
-		if (hw->mac.ops.get_media_type(hw) == ixgbe_media_type_fiber)
-			return (TRUE);
-		return (FALSE);
 	default:
 		return (FALSE);
 	}

Reply via email to