From: Matt Carlson Date: Wed, 27 Jul 2011 14:20:54 +0000 (+0000) Subject: tg3: Remove 5719 jumbo frames and TSO blocks X-Git-Tag: v2.6.39-400.9.0~423^2~19^2~11^2~688 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3027091901daa0f919010248c6d27d6d12b1d986;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: David S. Miller (cherry picked from commit a051294423b015c5c89f2ed78f7fe0893b775098) Signed-off-by: Joe Jin --- diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 2c0762b9289e..9c948eb383de 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -8404,7 +8404,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)) { @@ -13841,7 +13841,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); @@ -13911,7 +13911,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) ||