netdev
[Top] [All Lists]
<prev [Date] next>
[Advanced]
 <prev [Thread] next>

[patch 2.6.12-rc2 8/10] tg3: use TG3_FLG2_57{05,50}_PLUS flags in tg3_ge

from [John W. Linville] [Permanent Link][Original]
To: linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx
Subject: [patch 2.6.12-rc2 8/10] tg3: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
Date: Wed, 13 Apr 2005 19:38:45 -0400
Cc: jgarzik@xxxxxxxxx, davem@xxxxxxxxxxxxx
In-reply-to: <04132005193845.8720@laptop>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: PatchPost/0.1 
Rewrite checks in tg3_get_invariants to use TG3_FLG2_5705_PLUS and
TG3_FLG2_5750_PLUS flags.

Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---

 drivers/net/tg3.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

--- bcm5752-support/drivers/net/tg3.c.orig      2005-04-08 18:11:46.207874683 
-0400
+++ bcm5752-support/drivers/net/tg3.c   2005-04-08 18:11:36.696183379 -0400
@@ -7937,8 +7937,7 @@ static int __devinit tg3_get_invariants(
            GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
                tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;
 
-       if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
-           GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
+       if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
                tp->tg3_flags2 |= TG3_FLG2_HW_TSO;
 
        if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
@@ -8068,9 +8067,7 @@ static int __devinit tg3_get_invariants(
        if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)
                tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;
 
-       if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 ||
-           GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
-           GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
+       if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
                tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
 
        /* Only 5701 and later support tagged irq status mode.
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [patch 2.6.12-rc2 4/10] tg3: use TG3_FLG2_5705_PLUS instead of multi-way if's, John W. Linville
Next by Date:  [patch 2.6.12-rc2 2/10] tg3: add bcm5752 to tg3_pci_tbl, John W. Linville
Previous by Thread:  [patch 2.6.12-rc2 7/10] tg3: more use of TG3_FLG2_5705_PLUS flag, John W. Linville
Next by Thread:  [patch 2.6.12-rc2 9/10] tg3: check TG3_FLG2_5750_PLUS flag to set TG3_FLG2_5705_PLUS flag, John W. Linville
Indexes:  [Date] [Thread] [Top] [All Lists]