From 919ae978627cb9b9b773ad6138c9e57200edb5a2 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Mon, 3 Nov 2008 16:52:32 -0800
Subject: [PATCH] --- yaml --- r: 121695 b: refs/heads/master c:
 b2b98d4acc58a6f36b731e666c6ebd901cd6a27e h: refs/heads/master i:   121693:
 b55842d8aac31adced9d999e569848dbb5c2a807   121691:
 27ff0b904a9814bd1d1b09463fdaef0fd5bb4ddd   121687:
 92ee76a69b200b522979c9884f03986daff2fa82   121679:
 47241bb68e8e2107bdfd0d59c4309f88c53e0532   121663:
 78ca330cbf7fa184f2052f1af4fc38e070898ed4 v: v3

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

diff --git a/[refs] b/[refs]
index 86056aa65f3b..fbeb99c366d5 100644
--- 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
index 45fcbc3b141d..978d1f0ccb7d 100644
--- 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;