summaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2008-08-15 14:08:55 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-15 14:08:55 -0700
commitbc7959b2cbb57393b625b423c73e6fd07610257f (patch)
tree34866255e3e88d358847d2912da8c9193e07679e /drivers/net/tg3.c
parent3bda12589646caa22b2ed4ef7cf82d17ea59d7a6 (diff)
downloadblackbird-op-linux-bc7959b2cbb57393b625b423c73e6fd07610257f.tar.gz
blackbird-op-linux-bc7959b2cbb57393b625b423c73e6fd07610257f.zip
tg3: Turn off ASF "driver alive" heartbeats for APE
The ENABLE_ASF flag is set when DASH is enabled on the NIC, but DASH does not run on the RX CPU. Instead it runs on the APE. Consequently, the driver does not need to send "driver alive" updates to the RX CPU when the APE is present. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 0ebf2ff60c4b..e952b91ca2ac 100644
--- a/drivers/net/tg3.c
+++ b/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);
OpenPOWER on IntegriCloud