From 5a97cac019850fbbac2ce61be6cea2cf9ddc87a3 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Fri, 2 May 2008 16:48:59 -0700 Subject: [PATCH] --- yaml --- r: 95901 b: refs/heads/master c: 109115e1991824b88306b374b763d6857b292aeb h: refs/heads/master i: 95899: c119d745a4e957e713339fdede2e5956edd2d05b v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 86be5df0ee67..b77c79bd9622 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd1122a2593d0bbe19856e3943c859ebfe563583 +refs/heads/master: 109115e1991824b88306b374b763d6857b292aeb diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index b17812491b8a..bf376b32450e 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -9570,14 +9570,9 @@ static int tg3_test_loopback(struct tg3 *tp) /* Turn off link-based power management. */ cpmuctrl = tr32(TG3_CPMU_CTRL); - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 || - GET_CHIP_REV(tp->pci_chip_rev_id) == CHIPREV_5761_AX) - tw32(TG3_CPMU_CTRL, - cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE | - CPMU_CTRL_LINK_AWARE_MODE)); - else - tw32(TG3_CPMU_CTRL, - cpmuctrl & ~CPMU_CTRL_LINK_AWARE_MODE); + tw32(TG3_CPMU_CTRL, + cpmuctrl & ~(CPMU_CTRL_LINK_SPEED_MODE | + CPMU_CTRL_LINK_AWARE_MODE)); } if (tg3_run_loopback(tp, TG3_MAC_LOOPBACK))