From bb3bbe01f8954f74cc5306d56e8686d0e5dd1ddd Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Thu, 11 Oct 2007 19:49:11 -0700
Subject: [PATCH] --- yaml --- r: 67599 b: refs/heads/master c:
 9ce768ead83216d394175c0a0d72bc527648c7d0 h: refs/heads/master i:   67597:
 2aea434afb7eceb758c2487a05cae2277d0fd4a7   67595:
 ce1f2ae405af52ffb1dca56534dcf9d4b03a11f8   67591:
 6150f0953bc9ad7d8d7c886eb71a5421495b6b99   67583:
 7d723b3957ba0fa14ccd60f00332d283f39b1ac2 v: v3

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

diff --git a/[refs] b/[refs]
index 1967d9a9352d..39b43198e8fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7b850eaa1110b1fcdc09fdfe89e792828e9b7aa
+refs/heads/master: 9ce768ead83216d394175c0a0d72bc527648c7d0
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index a402b5c01896..e795c33b982d 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -6985,9 +6985,10 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 		break;
 	};
 
-	/* Write our heartbeat update interval to APE. */
-	tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_INT_MS,
-			APE_HOST_HEARTBEAT_INT_DISABLE);
+	if (tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)
+		/* Write our heartbeat update interval to APE. */
+		tg3_ape_write32(tp, TG3_APE_HOST_HEARTBEAT_INT_MS,
+				APE_HOST_HEARTBEAT_INT_DISABLE);
 
 	tg3_write_sig_post_reset(tp, RESET_KIND_INIT);