diff --git a/[refs] b/[refs]
index 8361071d2df8..7657c086e816 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3bda12589646caa22b2ed4ef7cf82d17ea59d7a6
+refs/heads/master: bc7959b2cbb57393b625b423c73e6fd07610257f
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 0ebf2ff60c4b..e952b91ca2ac 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -7862,7 +7862,8 @@ static void tg3_timer(unsigned long __opaque)
 	 * resets.
 	 */
 	if (!--tp->asf_counter) {
-		if (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) {
+		if ((tp->tg3_flags & TG3_FLAG_ENABLE_ASF) &&
+		    !(tp->tg3_flags3 & TG3_FLG3_ENABLE_APE)) {
 			u32 val;
 
 			tg3_wait_for_event_ack(tp);