* [PATCH] tg3: Fix APE induced regression
@ 2007-10-12 1:43 Matt Carlson
2007-10-12 2:46 ` David Miller
2007-10-12 5:44 ` Kyle McMartin
0 siblings, 2 replies; 3+ messages in thread
From: Matt Carlson @ 2007-10-12 1:43 UTC (permalink / raw)
To: davem; +Cc: netdev, andy, Michael Chan
This patch fixes a bug caused by the recent APE support added for 5761
devices.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
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);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] tg3: Fix APE induced regression
2007-10-12 1:43 [PATCH] tg3: Fix APE induced regression Matt Carlson
@ 2007-10-12 2:46 ` David Miller
2007-10-12 5:44 ` Kyle McMartin
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2007-10-12 2:46 UTC (permalink / raw)
To: mcarlson; +Cc: netdev, andy, mchan
From: "Matt Carlson" <mcarlson@broadcom.com>
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 <mcarlson@broadcom.com>
Thanks for this fix Matt, I'll apply it soon.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] tg3: Fix APE induced regression
2007-10-12 1:43 [PATCH] tg3: Fix APE induced regression Matt Carlson
2007-10-12 2:46 ` David Miller
@ 2007-10-12 5:44 ` Kyle McMartin
1 sibling, 0 replies; 3+ messages in thread
From: Kyle McMartin @ 2007-10-12 5:44 UTC (permalink / raw)
To: Matt Carlson; +Cc: netdev
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 <mcarlson@broadcom.com>
>
Woot, thanks! This just bit me as I was testing git head on some of my
parisc boxes.
Cheers,
Kyle
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-10-12 5:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-12 1:43 [PATCH] tg3: Fix APE induced regression Matt Carlson
2007-10-12 2:46 ` David Miller
2007-10-12 5:44 ` Kyle McMartin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).