From fafb98bde42b38cd636bb4caee43869eb8496372 Mon Sep 17 00:00:00 2001 From: Matt Carlson Date: Wed, 24 Nov 2010 08:31:50 +0000 Subject: [PATCH] --- yaml --- r: 224481 b: refs/heads/master c: deabaac8beeccdfee5358c0cd4c63258f28f3a74 h: refs/heads/master i: 224479: 5cd8b9689287b5b4cd2dbe2402072f306f9752a1 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5d16f3d47aa0..50441d45afe5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 07ae8fc00bcc97d2f896b257da225a0789b0aa5d +refs/heads/master: deabaac8beeccdfee5358c0cd4c63258f28f3a74 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index 226e60dfaeaf..4fa8ee30b70f 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -8165,8 +8165,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy) RDMAC_MODE_FIFOURUN_ENAB | RDMAC_MODE_FIFOOREAD_ENAB | RDMAC_MODE_LNGREAD_ENAB); - if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717 || - GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5719) + if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5717) rdmac_mode |= RDMAC_MODE_MULT_DMA_RD_DIS; if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5784 ||