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

[patch 2.6.12-rc2 7/10] tg3: more use of TG3_FLG2_5705_PLUS flag

from [John W. Linville] [Permanent Link][Original]
To: linux-kernel@xxxxxxxxxxxxxxx, netdev@xxxxxxxxxxx
Subject: [patch 2.6.12-rc2 7/10] tg3: more use of TG3_FLG2_5705_PLUS flag
From: "John W. Linville" <linville@xxxxxxxxxxxxx>
Date: Wed, 13 Apr 2005 19:38:45 -0400
Cc: jgarzik@xxxxxxxxx, davem@xxxxxxxxxxxxx
In-reply-to: <04132005193845.8656@laptop>
Sender: netdev-bounce@xxxxxxxxxxx
User-agent: PatchPost/0.1 
Rewrite of a couple of troublesome multi-way if statements to use
TG3_FLG2_5705_PLUS flag.

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

 drivers/net/tg3.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

--- bcm5752-support/drivers/net/tg3.c.orig      2005-04-08 18:00:31.886220435 
-0400
+++ bcm5752-support/drivers/net/tg3.c   2005-04-08 18:08:55.969298725 -0400
@@ -5237,10 +5237,8 @@ static int tg3_reset_hw(struct tg3 *tp)
                      RDMAC_MODE_LNGREAD_ENAB);
        if (tp->tg3_flags & TG3_FLAG_SPLIT_MODE)
                rdmac_mode |= RDMAC_MODE_SPLIT_ENABLE;
-       if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-            tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-           (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->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
                if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE &&
                    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
                     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
@@ -5353,10 +5351,8 @@ static int tg3_reset_hw(struct tg3 *tp)
               WDMAC_MODE_FIFOURUN_ENAB | WDMAC_MODE_FIFOOREAD_ENAB |
               WDMAC_MODE_LNGREAD_ENAB);
 
-       if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 &&
-            tp->pci_chip_rev_id != CHIPREV_ID_5705_A0) ||
-           (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->pci_chip_rev_id != CHIPREV_ID_5705_A0) {
                if ((tp->tg3_flags & TG3_FLG2_TSO_CAPABLE) &&
                    (tp->pci_chip_rev_id == CHIPREV_ID_5705_A1 ||
                     tp->pci_chip_rev_id == CHIPREV_ID_5705_A2)) {
[More with this subject...]
<Prev in Thread] Current Thread [Next in Thread>
Previous by Date:  [patch 2.6.12-rc2 3/10] tg3: add bcm5752 entry to pci_ids.h, John W. Linville
Next by Date:  [patch 2.6.12-rc2 0/10] add bcm5752 support plus some cleanup to tg3, John W. Linville
Previous by Thread:  [patch 2.6.12-rc2 6/10] tg3: use new TG3_FLG2_5750_PLUS flag, John W. Linville
Next by Thread:  [patch 2.6.12-rc2 8/10] tg3: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants, John W. Linville
Indexes:  [Date] [Thread] [Top] [All Lists]