aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tg3.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2005-04-21 20:02:41 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2005-04-21 20:02:41 -0400
commitbb7064dc09ff90015ddc7d818dd8fefb8ca5b936 (patch)
tree683f6e32186ea6e62dcb1647b05ab3ceb0d8de6c /drivers/net/tg3.c
parent863925f59e5425e4af6996b9c50857c766940176 (diff)
[TG3]: use TG3_FLG2_57{05,50}_PLUS flags in tg3_get_invariants
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@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tg3.c')
-rw-r--r--drivers/net/tg3.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index 46f8da6fc116..f47b30569192 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -7937,8 +7937,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
7937 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752) 7937 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
7938 tp->tg3_flags2 |= TG3_FLG2_5750_PLUS; 7938 tp->tg3_flags2 |= TG3_FLG2_5750_PLUS;
7939 7939
7940 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 || 7940 if (tp->tg3_flags2 & TG3_FLG2_5750_PLUS)
7941 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
7942 tp->tg3_flags2 |= TG3_FLG2_HW_TSO; 7941 tp->tg3_flags2 |= TG3_FLG2_HW_TSO;
7943 7942
7944 if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0) 7943 if (pci_find_capability(tp->pdev, PCI_CAP_ID_EXP) != 0)
@@ -8068,9 +8067,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
8068 if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0) 8067 if (tp->pci_chip_rev_id == CHIPREV_ID_5704_A0)
8069 tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG; 8068 tp->tg3_flags2 |= TG3_FLG2_PHY_5704_A0_BUG;
8070 8069
8071 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705 || 8070 if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
8072 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5750 ||
8073 GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752)
8074 tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG; 8071 tp->tg3_flags2 |= TG3_FLG2_PHY_BER_BUG;
8075 8072
8076 /* Only 5701 and later support tagged irq status mode. 8073 /* Only 5701 and later support tagged irq status mode.