From f347c026f2106d0d21a3d8a995c7f5bd2f8a8951 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Tue, 13 Feb 2007 12:17:25 -0800 Subject: [PATCH] --- yaml --- r: 48271 b: refs/heads/master c: d4011adaf8b5ea555357a40388ee9aa7ed2daf9f h: refs/heads/master i: 48269: 519cdf635a6382e70814c922dee5aca69ce5aa27 48267: 70388d7e95870fd7bfa82bb46325d6862d9cb83b 48263: 2b9a6c5d79af646e7bdfb2cec5a588e6dbe3e378 48255: 1eecad78d5c7bf2cef1bf84090fa6656191315d2 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ed4ec5904960..b757fdd4c166 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49afdeb65bb917e22cf9116bc31380befe9db890 +refs/heads/master: d4011adaf8b5ea555357a40388ee9aa7ed2daf9f diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 2df343f48207..fc94b19d1e28 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -10779,7 +10779,9 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) { if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5755 || GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5787) { - tp->tg3_flags2 |= TG3_FLG2_PHY_JITTER_BUG; + if (tp->pdev->device != PCI_DEVICE_ID_TIGON3_5756 && + tp->pdev->device != PCI_DEVICE_ID_TIGON3_5722) + tp->tg3_flags2 |= TG3_FLG2_PHY_JITTER_BUG; if (tp->pdev->device == PCI_DEVICE_ID_TIGON3_5755M) tp->tg3_flags2 |= TG3_FLG2_PHY_ADJUST_TRIM; } else if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5906)