From bf7ddb2aaa926a2281b1c50158d96a33161b07d4 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 20 Jul 2011 10:20:53 +0000 Subject: [PATCH] --- yaml --- r: 256528 b: refs/heads/master c: 5baa5e9aa28baccd2a1227095c25bb3e999f250d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a56b76b5f40a..0037ed44fe2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b715ce947f51c6637e78b262501f0c4ff9d848cc +refs/heads/master: 5baa5e9aa28baccd2a1227095c25bb3e999f250d diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index e0413bcce0f5..5110ea0be910 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -13142,7 +13142,9 @@ static int __devinit tg3_phy_probe(struct tg3 *tp) } if (!(tp->phy_flags & TG3_PHYFLG_ANY_SERDES) && - ((tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 && + (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719 || + GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5720 || + (tp->pdev->device == TG3PCI_DEVICE_TIGON3_5718 && tp->pci_chip_rev_id != CHIPREV_ID_5717_A0) || (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765 && tp->pci_chip_rev_id != CHIPREV_ID_57765_A0)))