From d71e0dd2a8a6434f4872f9c3f5cc242bde0adc7b Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Tue, 12 Jan 2010 10:11:36 +0000
Subject: [PATCH] --- yaml --- r: 179261 b: refs/heads/master c:
 13fa95b0398d65885a79c6e95a09976ee9f8c009 h: refs/heads/master i:   179259:
 1bfbd31a10aaca6ea57030cac365203112b57e9f v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/net/tg3.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a58783bdfdf2..9f8716cfe595 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3766c26a5d00189e5c0965c66f01956d15a92d6
+refs/heads/master: 13fa95b0398d65885a79c6e95a09976ee9f8c009
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index 3a74d2168598..5c77e6a48705 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -7742,7 +7742,7 @@ static int tg3_reset_hw(struct tg3 *tp, int reset_phy)
 	     ((u64) tpr->rx_std_mapping >> 32));
 	tw32(RCVDBDI_STD_BD + TG3_BDINFO_HOST_ADDR + TG3_64BIT_REG_LOW,
 	     ((u64) tpr->rx_std_mapping & 0xffffffff));
-	if (!(tp->tg3_flags3 & TG3_FLG3_5755_PLUS))
+	if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5717)
 		tw32(RCVDBDI_STD_BD + TG3_BDINFO_NIC_ADDR,
 		     NIC_SRAM_RX_BUFFER_DESC);