Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38690194 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b401e9e2

drivers/net/tg3.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -68,8 +68,8 @@ 




#define DRV_MODULE_NAME		"tg3"

#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.45"

#define DRV_MODULE_VERSION	"3.46"

#define DRV_MODULE_RELDATE	"Dec 13, 2005"

#define DRV_MODULE_RELDATE	"Dec 19, 2005"





#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0

#define TG3_DEF_RX_MODE		0
@@ -7975,13 +7975,12 @@ static int tg3_test_memory(struct tg3 *tp) 
		u32 offset;

		u32 offset;

		u32 len;

		u32 len;

	} mem_tbl_570x[] = {

	} mem_tbl_570x[] = {

		{ 0x00000000, 0x01000},

		{ 0x00000000, 0x00b50},

		{ 0x00002000, 0x1c000},

		{ 0x00002000, 0x1c000},

		{ 0xffffffff, 0x00000}

		{ 0xffffffff, 0x00000}

	}, mem_tbl_5705[] = {

	}, mem_tbl_5705[] = {

		{ 0x00000100, 0x0000c},

		{ 0x00000100, 0x0000c},

		{ 0x00000200, 0x00008},

		{ 0x00000200, 0x00008},

		{ 0x00000b50, 0x00400},

		{ 0x00004000, 0x00800},

		{ 0x00004000, 0x00800},

		{ 0x00006000, 0x01000},

		{ 0x00006000, 0x01000},

		{ 0x00008000, 0x02000},

		{ 0x00008000, 0x02000},