---

yaml --- r: 121695 b: refs/heads/master c: b2b98d4 h: refs/heads/master i: 121693: b55842d 121691: 27ff0b9 121687: 92ee76a 121679: 47241bb 121663: 78ca330 v: v3
git-mirror · Nov 4, 2008 · 919ae97 · 919ae97
1 parent f5bc31b
commit 919ae97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcb37f6cb57e565e7bd342272652c3a50cf88761
+refs/heads/master: b2b98d4acc58a6f36b731e666c6ebd901cd6a27e
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
@@ -11441,8 +11441,11 @@ static void __devinit tg3_get_eeprom_hw_cfg(struct tg3 *tp)
 			if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
 				tp->tg3_flags2 |= TG3_FLG2_ASF_NEW_HANDSHAKE;
 		}
-		if (nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE)
+
+		if ((nic_cfg & NIC_SRAM_DATA_CFG_APE_ENABLE) &&
+			(tp->tg3_flags2 & TG3_FLG2_5750_PLUS))
 			tp->tg3_flags3 |= TG3_FLG3_ENABLE_APE;
+
 		if (tp->tg3_flags2 & TG3_FLG2_ANY_SERDES &&
 		    !(nic_cfg & NIC_SRAM_DATA_CFG_FIBER_WOL))
 			tp->tg3_flags &= ~TG3_FLAG_WOL_CAP;