* [PATCH] tg3: Expand 5719 workaround
@ 2011-02-11 1:57 Matt Carlson
2011-02-11 4:04 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Matt Carlson @ 2011-02-11 1:57 UTC (permalink / raw)
To: davem; +Cc: netdev, mcarlson
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>
---
drivers/net/tg3.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index cc06952..ecb3eb0 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13318,7 +13318,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
}
/* Determine TSO capabilities */
- if (tp->pci_chip_rev_id == CHIPREV_ID_5719_A0)
+ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719)
; /* Do nothing. HW bug. */
else if (tp->tg3_flags3 & TG3_FLG3_5717_PLUS)
tp->tg3_flags2 |= TG3_FLG2_HW_TSO_3;
@@ -13372,7 +13372,7 @@ static int __devinit tg3_get_invariants(struct tg3 *tp)
}
if ((tp->tg3_flags3 & TG3_FLG3_5717_PLUS) &&
- tp->pci_chip_rev_id != CHIPREV_ID_5719_A0)
+ GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719)
tp->tg3_flags3 |= TG3_FLG3_USE_JUMBO_BDFLAG;
if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS) ||
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tg3: Expand 5719 workaround
2011-02-11 1:57 [PATCH] tg3: Expand 5719 workaround Matt Carlson
@ 2011-02-11 4:04 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-02-11 4:04 UTC (permalink / raw)
To: mcarlson; +Cc: netdev
From: "Matt Carlson" <mcarlson@broadcom.com>
Date: Thu, 10 Feb 2011 17:57:27 -0800
> 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>
Applied to net-next-2.6, since that is where this applied cleanly.
If you want this in net-2.6 too, just submit a patch which applies
cleanly there.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-02-11 4:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-11 1:57 [PATCH] tg3: Expand 5719 workaround Matt Carlson
2011-02-11 4:04 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).