svn commit: r303268 - stable/11/sys/dev/ixgbe
Sean Bruno
sbruno at FreeBSD.org
Sun Jul 24 16:32:35 UTC 2016
Author: sbruno
Date: Sun Jul 24 16:32:34 2016
New Revision: 303268
URL: https://svnweb.freebsd.org/changeset/base/303268
Log:
MFC r303032
Fixup DA cable detection routines to not set the cable type to
unknown if they do not match one of two cable types.
PR: 150249
Approved by: re (gjb)
Modified:
stable/11/sys/dev/ixgbe/ixgbe_phy.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/dev/ixgbe/ixgbe_phy.c
==============================================================================
--- stable/11/sys/dev/ixgbe/ixgbe_phy.c Sun Jul 24 14:50:16 2016 (r303267)
+++ stable/11/sys/dev/ixgbe/ixgbe_phy.c Sun Jul 24 16:32:34 2016 (r303268)
@@ -1534,21 +1534,18 @@ s32 ixgbe_identify_sfp_module_generic(st
hw->phy.type = ixgbe_phy_sfp_intel;
break;
default:
- if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
- hw->phy.type =
- ixgbe_phy_sfp_passive_unknown;
- else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
- hw->phy.type =
- ixgbe_phy_sfp_active_unknown;
- else
- hw->phy.type = ixgbe_phy_sfp_unknown;
+ hw->phy.type = ixgbe_phy_sfp_unknown;
break;
}
}
/* Allow any DA cable vendor */
if (cable_tech & (IXGBE_SFF_DA_PASSIVE_CABLE |
- IXGBE_SFF_DA_ACTIVE_CABLE)) {
+ IXGBE_SFF_DA_ACTIVE_CABLE)) {
+ if (cable_tech & IXGBE_SFF_DA_PASSIVE_CABLE)
+ hw->phy.type = ixgbe_phy_sfp_passive_unknown;
+ else if (cable_tech & IXGBE_SFF_DA_ACTIVE_CABLE)
+ hw->phy.type = ixgbe_phy_sfp_active_unknown;
status = IXGBE_SUCCESS;
goto out;
}
More information about the svn-src-stable
mailing list