---

yaml --- r: 203995 b: refs/heads/master c: 8c69b1e h: refs/heads/master i: 203993: 60d70a4 203991: b9e11ec v: v3
git-mirror · Aug 2, 2010 · 38ba17a · 38ba17a
1 parent 46fd42c
commit 38ba17a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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);