]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[TG3]: Fix ethtool memory test
authorMichael Chan <mchan@broadcom.com>
Tue, 20 Dec 2005 00:27:28 +0000 (16:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 20 Dec 2005 00:27:28 +0000 (16:27 -0800)
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>
drivers/net/tg3.c

index b0d963c8374699c4f158f752f6011710dff2722e..cefb0c08a68d4999c2cb6cf6790f0349e75b9d2a 100644 (file)
@@ -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},