aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2005-12-19 19:27:28 -0500
committerDavid S. Miller <davem@davemloft.net>2005-12-19 19:27:28 -0500
commit38690194bc897dd60a61a71b15e861e13b5d8bdd (patch)
treee22bcf8fa17bb374beff14a8fb693334e6e99f19
parentb401e9e2ec44a5fc1d8053546276bff584b7118e (diff)
[TG3]: Fix ethtool memory test
Skip the memory 0xb50 to 0x1000 during "ethtool -t" memory test. Overwriting memory in this region can cause ASF problems. Update version and release date. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/tg3.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index b0d963c8374..cefb0c08a68 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -68,8 +68,8 @@
68 68
69#define DRV_MODULE_NAME "tg3" 69#define DRV_MODULE_NAME "tg3"
70#define PFX DRV_MODULE_NAME ": " 70#define PFX DRV_MODULE_NAME ": "
71#define DRV_MODULE_VERSION "3.45" 71#define DRV_MODULE_VERSION "3.46"
72#define DRV_MODULE_RELDATE "Dec 13, 2005" 72#define DRV_MODULE_RELDATE "Dec 19, 2005"
73 73
74#define TG3_DEF_MAC_MODE 0 74#define TG3_DEF_MAC_MODE 0
75#define TG3_DEF_RX_MODE 0 75#define TG3_DEF_RX_MODE 0
@@ -7975,13 +7975,12 @@ static int tg3_test_memory(struct tg3 *tp)
7975 u32 offset; 7975 u32 offset;
7976 u32 len; 7976 u32 len;
7977 } mem_tbl_570x[] = { 7977 } mem_tbl_570x[] = {
7978 { 0x00000000, 0x01000}, 7978 { 0x00000000, 0x00b50},
7979 { 0x00002000, 0x1c000}, 7979 { 0x00002000, 0x1c000},
7980 { 0xffffffff, 0x00000} 7980 { 0xffffffff, 0x00000}
7981 }, mem_tbl_5705[] = { 7981 }, mem_tbl_5705[] = {
7982 { 0x00000100, 0x0000c}, 7982 { 0x00000100, 0x0000c},
7983 { 0x00000200, 0x00008}, 7983 { 0x00000200, 0x00008},
7984 { 0x00000b50, 0x00400},
7985 { 0x00004000, 0x00800}, 7984 { 0x00004000, 0x00800},
7986 { 0x00006000, 0x01000}, 7985 { 0x00006000, 0x01000},
7987 { 0x00008000, 0x02000}, 7986 { 0x00008000, 0x02000},