diff options
author | Matt Carlson <mcarlson@broadcom.com> | 2011-07-27 14:20:54 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-07-27 22:39:32 -0700 |
commit | a051294423b015c5c89f2ed78f7fe0893b775098 (patch) | |
tree | 840072c6503d5f0c82623d732a3b352edbd15a3c | |
parent | e31aa9870627106aebddd280aab8ecb2f493246a (diff) | |
download | linux-3.10-a051294423b015c5c89f2ed78f7fe0893b775098.tar.gz linux-3.10-a051294423b015c5c89f2ed78f7fe0893b775098.tar.bz2 linux-3.10-a051294423b015c5c89f2ed78f7fe0893b775098.zip |
tg3: Remove 5719 jumbo frames and TSO blocks
The A0 revision of this chip is the only device that requires these
features to be disabled.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/tg3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index c77a39d6cd1..dc3fbf61910 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8406,7 +8406,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) /* Program the jumbo buffer descriptor ring control * blocks on those devices that have them. */ - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || + if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0 || (tg3_flag(tp, JUMBO_CAPABLE) && !tg3_flag(tp, 5780_CLASS))) { if (tg3_flag(tp, JUMBO_RING_ENABLE)) { @@ -13873,7 +13873,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) tg3_flag_set(tp, 5705_PLUS); /* Determine TSO capabilities */ - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) + if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0) ; /* Do nothing. HW bug. */ else if (tg3_flag(tp, 57765_PLUS)) tg3_flag_set(tp, HW_TSO_3); @@ -13943,7 +13943,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) tg3_flag_set(tp, LRG_PROD_RING_CAP); if (tg3_flag(tp, 57765_PLUS) && - GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719) + tp->pci_chip_rev_id != CHIPREV_ID_5719_A0) tg3_flag_set(tp, USE_JUMBO_BDFLAG); if (!tg3_flag(tp, 5705_PLUS) || |