From 7eb22d5648f3826bcf16e00589a7ee84e8bfc286 Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Wed, 21 Jan 2009 14:42:28 -0800
Subject: [PATCH] --- yaml --- r: 133866 b: refs/heads/master c:
 921aa7491201b238589ab9f94184b18a1ed00e12 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/igb/e1000_82575.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ed225485aa67..ebaa11be469b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5851765cca21e973a7f4850fbaf1ef55e0cb1965
+refs/heads/master: 921aa7491201b238589ab9f94184b18a1ed00e12
diff --git a/trunk/drivers/net/igb/e1000_82575.c b/trunk/drivers/net/igb/e1000_82575.c
index f5e2e7235fcb..9b367ba8e26f 100644
--- a/trunk/drivers/net/igb/e1000_82575.c
+++ b/trunk/drivers/net/igb/e1000_82575.c
@@ -1103,6 +1103,13 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *hw)
 	       E1000_CTRL_SWDPIN1;
 	wr32(E1000_CTRL, reg);
 
+	/* Power on phy for 82576 fiber adapters */
+	if (hw->mac.type == e1000_82576) {
+		reg = rd32(E1000_CTRL_EXT);
+		reg &= ~E1000_CTRL_EXT_SDP7_DATA;
+		wr32(E1000_CTRL_EXT, reg);
+	}
+
 	/* Set switch control to serdes energy detect */
 	reg = rd32(E1000_CONNSW);
 	reg |= E1000_CONNSW_ENRGSRC;