aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorMatt Carlson <mcarlson@broadcom.com>2011-02-10 23:06:46 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-10 23:06:46 -0500
commit2866d956fe0ad8fc8d8a7c54104ccc879b49406d (patch)
tree907f938a3038805b79386b09c9a1131823bbca78 /drivers/net
parent6431cbc25fa21635ee04eb0516ba6c51389fbfac (diff)
tg3: Expand 5719 workaround
As a precautionary measure, expand the fix submitted in commit 4d163b75e979833979cc401ae433cb1d7743d57e entitled "tg3: Fix 5719 A0 tx completion bug" to apply to all 5719 revisions. Signed-off-by: Matt Carlson <mcarlson@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/tg3.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cc069528b322..ecb3eb099bf6 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13318,7 +13318,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13318 } 13318 }
13319 13319
13320 /* Determine TSO capabilities */ 13320 /* Determine TSO capabilities */
13321 if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0) 13321 if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
13322 ; /* Do nothing. HW bug. */ 13322 ; /* Do nothing. HW bug. */
13323 else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS) 13323 else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
13324 tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3; 13324 tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
@@ -13372,7 +13372,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
13372 } 13372 }
13373 13373
13374 if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) && 13374 if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
13375 tp->pci_chip_rev_id != CHIPREV_ID_5719_A0) 13375 GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
13376 tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG; 13376 tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
13377 13377
13378 if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) || 13378 if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||