[PATCH] tg3: Fix APE induced regression

[Matt Carlson]

This patch fixes a bug caused by the recent APE support added for 5761
devices.

Signed-off-by: Matt Carlson [EMAIL PROTECTED]

diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index d2b30fb..e978a79 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -6966,9 +6966,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);
 


-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] tg3: Fix APE induced regression

[David Miller]

From: Matt Carlson [EMAIL PROTECTED]
Date: Thu, 11 Oct 2007 18:43:50 -0700

 This patch fixes a bug caused by the recent APE support added for 5761
 devices.
 
 Signed-off-by: Matt Carlson [EMAIL PROTECTED]

Thanks for this fix Matt, I'll apply it soon.
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] tg3: Fix APE induced regression

[Kyle McMartin]

On Thu, Oct 11, 2007 at 06:43:50PM -0700, Matt Carlson wrote:
 This patch fixes a bug caused by the recent APE support added for 5761
 devices.
 
 Signed-off-by: Matt Carlson [EMAIL PROTECTED]
 

Woot, thanks! This just bit me as I was testing git head on some of my
parisc boxes.

Cheers,
Kyle
-
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html