From 38ba17a1b4754f9d3939f42ccbde69c1e4b7ffb3 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 2 Aug 2010 11:26:00 +0000
Subject: [PATCH] --- yaml --- r: 203995 b: refs/heads/master c:
 8c69b1e702527e39c0b4fbda79d2738d186a3908 h: refs/heads/master i:   203993:
 60d70a41a10de4eb603f858c27cbb1e5dea41e3a   203991:
 b9e11ec337872917d56d757b98e2a53a323f6c3f v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b717e0854a67..66887dbf5746 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f37500d3f66ba82888315838278d56fc27308327
+refs/heads/master: 8c69b1e702527e39c0b4fbda79d2738d186a3908
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 38979f24e541..7c2c81ab4838 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -12188,7 +12188,9 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 		    (cfg2 & NIC_SRAM_DATA_CFG_2_APD_EN))
 			tp->tg3_flags3 |= TG3_FLG3_PHY_ENABLE_APD;
 
-		if (tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) {
+		if ((tp->tg3_flags2 & TG3_FLG2_PCI_EXPRESS) &&
+		    GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5785 &&
+		    !(tp->tg3_flags3 & TG3_FLG3_5717_PLUS)) {
 			u32 cfg3;
 
 			tg3_read_mem(tp, NIC_SRAM_DATA_CFG_3, &cfg3);