From eb9648376acc117298d2aad23f02a90650e51f53 Mon Sep 17 00:00:00 2001
From: "Waskiewicz Jr, Peter P" <peter.p.waskiewicz.jr@intel.com>
Date: Thu, 23 Apr 2009 11:31:37 +0000
Subject: [PATCH] --- yaml --- r: 150028 b: refs/heads/master c:
 fa466e91bdf214e6e136e9da9a46a52775a1e884 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/net/ixgbe/ixgbe_phy.c  | 22 +++++++++++++++++-----
 trunk/drivers/net/ixgbe/ixgbe_type.h |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 10a5c37d744f..3365caee3911 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78b1f6070fa16cb442a7c48e8f5364cd84a88b90
+refs/heads/master: fa466e91bdf214e6e136e9da9a46a52775a1e884
diff --git a/trunk/drivers/net/ixgbe/ixgbe_phy.c b/trunk/drivers/net/ixgbe/ixgbe_phy.c
index f3258ec901fe..2543c32ca84a 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_phy.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_phy.c
@@ -673,11 +673,22 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 				break;
 			}
 		}
-		if (hw->mac.type == ixgbe_mac_82598EB ||
-		    (hw->phy.sfp_type != ixgbe_sfp_type_sr &&
-		     hw->phy.sfp_type != ixgbe_sfp_type_lr &&
-		     hw->phy.sfp_type != ixgbe_sfp_type_srlr_core0 &&
-		     hw->phy.sfp_type != ixgbe_sfp_type_srlr_core1)) {
+
+		/* All DA cables are supported */
+		if (transmission_media & IXGBE_SFF_TWIN_AX_CAPABLE) {
+			status = 0;
+			goto out;
+		}
+
+		/* 1G SFP modules are not supported */
+		if (comp_codes_10g == 0) {
+			hw->phy.type = ixgbe_phy_sfp_unsupported;
+			status = IXGBE_ERR_SFP_NOT_SUPPORTED;
+			goto out;
+		}
+
+		/* Anything else 82598-based is supported */
+		if (hw->mac.type == ixgbe_mac_82598EB) {
 			status = 0;
 			goto out;
 		}
@@ -690,6 +701,7 @@ s32 ixgbe_identify_sfp_module_generic(struct ixgbe_hw *hw)
 				status = 0;
 			} else {
 				hw_dbg(hw, "SFP+ module not supported\n");
+				hw->phy.type = ixgbe_phy_sfp_unsupported;
 				status = IXGBE_ERR_SFP_NOT_SUPPORTED;
 			}
 		} else {
diff --git a/trunk/drivers/net/ixgbe/ixgbe_type.h b/trunk/drivers/net/ixgbe/ixgbe_type.h
index a3317d8fbf6a..375f0d4ad965 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_type.h
+++ b/trunk/drivers/net/ixgbe/ixgbe_type.h
@@ -1904,6 +1904,7 @@ enum ixgbe_phy_type {
 	ixgbe_phy_sfp_ftl,
 	ixgbe_phy_sfp_unknown,
 	ixgbe_phy_sfp_intel,
+	ixgbe_phy_sfp_unsupported,
 	ixgbe_phy_generic
 };