Module Name: src
Committed By: msaitoh
Date: Thu Jun 27 06:00:11 UTC 2019
Modified Files:
src/sys/dev/pci/ixgbe: ixgbe_x550.c
Log Message:
Sync with FreeBSD ix-3.3.8 part 2:
- Add missing XFI support into ixgbe_get_link_capabilities_X550em().
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/pci/ixgbe/ixgbe_x550.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_x550.c
diff -u src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.14 src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.15
--- src/sys/dev/pci/ixgbe/ixgbe_x550.c:1.14 Thu Dec 6 13:25:02 2018
+++ src/sys/dev/pci/ixgbe/ixgbe_x550.c Thu Jun 27 06:00:11 2019
@@ -2084,7 +2084,14 @@ s32 ixgbe_get_link_capabilities_X550em(s
else
*speed = IXGBE_LINK_SPEED_10GB_FULL;
} else {
+ *autoneg = TRUE;
+
switch (hw->phy.type) {
+ case ixgbe_phy_x550em_xfi:
+ *speed = IXGBE_LINK_SPEED_1GB_FULL |
+ IXGBE_LINK_SPEED_10GB_FULL;
+ *autoneg = FALSE;
+ break;
case ixgbe_phy_ext_1g_t:
case ixgbe_phy_sgmii:
*speed = IXGBE_LINK_SPEED_1GB_FULL;
@@ -2108,7 +2115,6 @@ s32 ixgbe_get_link_capabilities_X550em(s
IXGBE_LINK_SPEED_1GB_FULL;
break;
}
- *autoneg = TRUE;
}
return IXGBE_SUCCESS;
