aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-07-27 10:20:54 -0400
committerDavid S. Miller <davem@davemloft.net>2011-07-28 01:39:32 -0400
commita051294423b015c5c89f2ed78f7fe0893b775098 (patch)
tree840072c6503d5f0c82623d732a3b352edbd15a3c
parente31aa9870627106aebddd280aab8ecb2f493246a (diff)
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.c6
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)
8406 /* Program the jumbo buffer descriptor ring control 8406 /* Program the jumbo buffer descriptor ring control
8407 * blocks on those devices that have them. 8407 * blocks on those devices that have them.
8408 */ 8408 */
8409 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || 8409 if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0 ||
8410 (tg3_flag(tp, JUMBO_CAPABLE) && !tg3_flag(tp, 5780_CLASS))) { 8410 (tg3_flag(tp, JUMBO_CAPABLE) && !tg3_flag(tp, 5780_CLASS))) {
8411 8411
8412 if (tg3_flag(tp, JUMBO_RING_ENABLE)) { 8412 if (tg3_flag(tp, JUMBO_RING_ENABLE)) {
@@ -13873,7 +13873,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13873 tg3_flag_set(tp, 5705_PLUS); 13873 tg3_flag_set(tp, 5705_PLUS);
13874 13874
13875 /* Determine TSO capabilities */ 13875 /* Determine TSO capabilities */
13876 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) 13876 if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0)
13877 ; /* Do nothing. HW bug. */ 13877 ; /* Do nothing. HW bug. */
13878 else if (tg3_flag(tp, 57765_PLUS)) 13878 else if (tg3_flag(tp, 57765_PLUS))
13879 tg3_flag_set(tp, HW_TSO_3); 13879 tg3_flag_set(tp, HW_TSO_3);
@@ -13943,7 +13943,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13943 tg3_flag_set(tp, LRG_PROD_RING_CAP); 13943 tg3_flag_set(tp, LRG_PROD_RING_CAP);
13944 13944
13945 if (tg3_flag(tp, 57765_PLUS) && 13945 if (tg3_flag(tp, 57765_PLUS) &&
13946 GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719) 13946 tp->pci_chip_rev_id != CHIPREV_ID_5719_A0)
13947 tg3_flag_set(tp, USE_JUMBO_BDFLAG); 13947 tg3_flag_set(tp, USE_JUMBO_BDFLAG);
13948 13948
13949 if (!tg3_flag(tp, 5705_PLUS) || 13949 if (!tg3_flag(tp, 5705_PLUS) ||