| Message ID | 1297450480-5998-1-git-send-email-mcarlson@broadcom.com |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "Matt Carlson" <mcarlson@broadcom.com> Date: Fri, 11 Feb 2011 10:54:40 -0800 > The previous patch applied cleanly for me, but here it is for net-2.6. I'm not making it up, this one fails too: davem@sunset:~/src/GIT/net-2.6$ git apply --check --whitespace=error-all diff error: patch failed: drivers/net/tg3.c:13318 error: drivers/net/tg3.c: patch does not apply GIT wants the line numbers to match up exactly, no fuzz is allowed. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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) ||
The previous patch applied cleanly for me, but here it is for net-2.6. ----------- 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(-)