diff options
| author | Matt Carlson <mcarlson@broadcom.com> | 2007-10-11 19:49:11 -0700 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-11 22:17:20 -0700 |
| commit | 9ce768ead83216d394175c0a0d72bc527648c7d0 (patch) | |
| tree | b323b3c179bb194ed40277b26ae1ceb8035f2edc /drivers/net | |
| parent | a7b850eaa1110b1fcdc09fdfe89e792828e9b7aa (diff) | |
| download | linux-stable-9ce768ead83216d394175c0a0d72bc527648c7d0.tar.gz linux-stable-9ce768ead83216d394175c0a0d72bc527648c7d0.tar.bz2 linux-stable-9ce768ead83216d394175c0a0d72bc527648c7d0.zip | |
[TG3]: Fix APE induced regression
This patch fixes a bug caused by the recent APE support added for 5761
devices.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/tg3.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index a402b5c01896..e795c33b982d 100644 --- a/drivers/net/tg3.c +++ b/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); |