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

Commit a4a8bb15 authored by Matt Carlson's avatar Matt Carlson Committed by David S. Miller
Browse files

tg3: Dynamically allocate VPD data memory 



This patch eases stack pressure by dynamically allocating the memory
used to temporarily store VPD data.

Reviewed-by: default avatarBenjamin Li <benli@broadcom.com>
Reviewed-by: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarMatt Carlson <mcarlson@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 02e96080

drivers/net/tg3.c

+11 −4
Original line number Diff line number Diff line
@@ -12415,14 +12415,18 @@ static int __devinit tg3_phy_probe(struct tg3 *tp) 


static void __devinit tg3_read_vpd(struct tg3 *tp)

{

	u8 vpd_data[TG3_NVM_VPD_LEN];

	u8 *vpd_data;

	unsigned int block_end, rosize, len;

	int j, i = 0;

	u32 magic;



	if ((tp->tg3_flags3 & TG3_FLG3_NO_NVRAM) ||

	    tg3_nvram_read(tp, 0x0, &magic))

		goto out_not_found;

		goto out_no_vpd;



	vpd_data = kmalloc(TG3_NVM_VPD_LEN, GFP_KERNEL);

	if (!vpd_data)

		goto out_no_vpd;



	if (magic == TG3_EEPROM_MAGIC) {

		for (i = 0; i < TG3_NVM_VPD_LEN; i += 4) {
@@ -12506,9 +12510,12 @@ static void __devinit tg3_read_vpd(struct tg3 *tp) 


	memcpy(tp->board_part_number, &vpd_data[i], len);



out_not_found:

	kfree(vpd_data);

	if (!tp->board_part_number[0])

		return;



out_not_found:

out_no_vpd:

	if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906)

		strcpy(tp->board_part_number, "BCM95906");

	else if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57780 &&