---

yaml --- r: 67599 b: refs/heads/master c: 9ce768e h: refs/heads/master i: 67597: 2aea434 67595: ce1f2ae 67591: 6150f09 67583: 7d723b3 v: v3
git-mirror · Oct 12, 2007 · bb3bbe0 · bb3bbe0
1 parent 4ee52c7
commit bb3bbe0
Show file tree

Hide file tree

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