From 1642b4c07482a0fae49c3dd72d34c928e0185573 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 15 Sep 2010 08:59:56 +0000 Subject: [PATCH] --- yaml --- r: 214526 b: refs/heads/master c: 2e9f7a7408d264f01d4477c564ef5c6b610cd10f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 31234627d77c..985211d8dbcc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc6d074457f1551f9357f773a4eda09a3d5ef150 +refs/heads/master: 2e9f7a7408d264f01d4477c564ef5c6b610cd10f diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index fc9706c8e3c6..4e92b81bccfa 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -13431,10 +13431,6 @@ static int __devinit tg3_get_invariants(struct tg3 *tp) if (err) return err; - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 && - tp->pci_chip_rev_id != CHIPREV_ID_5717_A0) - return -ENOTSUPP; - /* Initialize data/descriptor byte/word swapping. */ val = tr32(GRC_MODE); val &= GRC_MODE_HOST_STACKUP; @@ -14463,7 +14459,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, } if ((tp->tg3_flags3 & TG3_FLG3_5755_PLUS) && - tp->pci_chip_rev_id != CHIPREV_ID_5717_A0 && + GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717 && GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5719) dev->netdev_ops = &tg3_netdev_ops; else