From 45701060da56f06bf6f83f58bedc7034cc64bf00 Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Mon, 19 Dec 2005 16:27:28 -0800
Subject: [PATCH] --- yaml --- r: 15243 b: refs/heads/master c:
 38690194bc897dd60a61a71b15e861e13b5d8bdd h: refs/heads/master i:   15241:
 bf3ca48cde6f1aa1843e1f1bbaed704bbfa5ea15   15239:
 971b9a524bf320be0172df2f8811606e2f87172d v: v3

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

diff --git a/[refs] b/[refs]
index 3ce070624dcf..67411dab382d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b401e9e2ec44a5fc1d8053546276bff584b7118e
+refs/heads/master: 38690194bc897dd60a61a71b15e861e13b5d8bdd
diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c
index b0d963c83746..cefb0c08a68d 100644
--- a/trunk/drivers/net/tg3.c
+++ b/trunk/drivers/net/tg3.c
@@ -68,8 +68,8 @@
 
 #define DRV_MODULE_NAME		"tg3"
 #define PFX DRV_MODULE_NAME	": "
-#define DRV_MODULE_VERSION	"3.45"
-#define DRV_MODULE_RELDATE	"Dec 13, 2005"
+#define DRV_MODULE_VERSION	"3.46"
+#define DRV_MODULE_RELDATE	"Dec 19, 2005"
 
 #define TG3_DEF_MAC_MODE	0
 #define TG3_DEF_RX_MODE		0
@@ -7975,13 +7975,12 @@ static int tg3_test_memory(struct tg3 *tp)
 		u32 offset;
 		u32 len;
 	} mem_tbl_570x[] = {
-		{ 0x00000000, 0x01000},
+		{ 0x00000000, 0x00b50},
 		{ 0x00002000, 0x1c000},
 		{ 0xffffffff, 0x00000}
 	}, mem_tbl_5705[] = {
 		{ 0x00000100, 0x0000c},
 		{ 0x00000200, 0x00008},
-		{ 0x00000b50, 0x00400},
 		{ 0x00004000, 0x00800},
 		{ 0x00006000, 0x01000},
 		{ 0x00008000, 0x02000},