From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Thu, 21 Jul 2011 00:40:51 +0000 (+0000)
Subject: ixgbe: Add SFP support for missed 82598 PHY
X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~185
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a8aa3416e16639c2020be95e0a059ab20394e1ed;p=users%2Fjedix%2Flinux-maple.git

ixgbe: Add SFP support for missed 82598 PHY

One of the 82598 phys was not being correctly identified as being SFP.
This change corrects that.

(cherry picked from commit 8917b447b75818823f4d0b7dc8cdd9248a4d5445)
Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index cc3f761e8f01..95af2f0e6107 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3450,6 +3450,9 @@ static inline bool ixgbe_is_sfp(struct ixgbe_hw *hw)
 	case ixgbe_phy_sfp_active_unknown:
 	case ixgbe_phy_sfp_ftl_active:
 		return true;
+	case ixgbe_phy_nl:
+		if (hw->mac.type == ixgbe_mac_82598EB)
+			return true;
 	default:
 		return false;
 	}