svn commit: r303269 - stable/10/sys/dev/ixgbe

[Sean Bruno]

Author: sbruno
Date: Sun Jul 24 16:33:48 2016
New Revision: 303269
URL: https://svnweb.freebsd.org/changeset/base/303269

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

Modified:
  stable/10/sys/dev/ixgbe/ixgbe_phy.c

Modified: stable/10/sys/dev/ixgbe/ixgbe_phy.c
==============================================================================
--- stable/10/sys/dev/ixgbe/ixgbe_phy.c	Sun Jul 24 16:32:34 2016	(r303268)
+++ stable/10/sys/dev/ixgbe/ixgbe_phy.c	Sun Jul 24 16:33:48 2016	(r303269)
@@ -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;
 		}