From ce1f2ae405af52ffb1dca56534dcf9d4b03a11f8 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Thu, 11 Oct 2007 19:47:44 -0700
Subject: [PATCH] --- yaml --- r: 67595 b: refs/heads/master c:
 ff35164e72648e0bf0b10ec4410c195e8607e88b h: refs/heads/master i:   67593:
 2482b577b36ccc1d918f454e205bb9073590a2dc   67591:
 6150f0953bc9ad7d8d7c886eb71a5421495b6b99 v: v3

---
 [refs]                   |  2 +-
 trunk/drivers/net/sky2.c | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 4c27aa132554..fe0a06259e82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 295b54c4902c52cd00d7c837d50a86e39e26caec
+refs/heads/master: ff35164e72648e0bf0b10ec4410c195e8607e88b
diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
index 4832f6403721..c9ee8a2c24b5 100644
--- a/trunk/drivers/net/sky2.c
+++ b/trunk/drivers/net/sky2.c
@@ -606,20 +606,19 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 {
 	struct pci_dev *pdev = hw->pdev;
 	u32 reg1;
-	static const u32 phy_power[]
-		= { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
-
-	/* looks like this XL is back asswards .. */
-	if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
-		onoff = !onoff;
+	static const u32 phy_power[] = { PCI_Y2_PHY1_POWD, PCI_Y2_PHY2_POWD };
+	static const u32 coma_mode[] = { PCI_Y2_PHY1_COMA, PCI_Y2_PHY2_COMA };
 
 	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);
+	/* Turn on/off phy power saving */
 	if (onoff)
-		/* Turn off phy power saving */
 		reg1 &= ~phy_power[port];
 	else
 		reg1 |= phy_power[port];
 
+	if (onoff && hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
+		reg1 |= coma_mode[port];
+
 	pci_write_config_dword(pdev, PCI_DEV_REG1, reg1);
 	pci_read_config_dword(pdev, PCI_DEV_REG1, &reg1);