lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netxen: reduce stack usage of netxen_nic_flash_print

Browse Source 
Don't need to keep a struct netxen_new_user_info on the stack
when we only are interested in printing the serial_num.  Change
to only reading the serial_num.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Harvey Harrison
2008-04-22 11:48:35 -07:00
committed by Jeff Garzik
parent db2961c5a1
commit 8d74849b91
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/net/netxen/netxen_nic_hw.c
View File

@@ -1132,8 +1132,8 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
u32 fw_minor = 0; u32 fw_minor = 0;
u32 fw_build = 0; u32 fw_build = 0;
char brd_name[NETXEN_MAX_SHORT_NAME]; char brd_name[NETXEN_MAX_SHORT_NAME];
struct netxen_new_user_info user_info; char serial_num[32];
int i, addr = NETXEN_USER_START; int i, addr;
__le32 *ptr32; __le32 *ptr32;
struct netxen_board_info *board_info = &(adapter->ahw.boardcfg); struct netxen_board_info *board_info = &(adapter->ahw.boardcfg);
@@ -1150,10 +1150,10 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
valid = 0; valid = 0;
} }
if (valid) { if (valid) {
ptr32 = (u32 *) & user_info; ptr32 = (u32 *)&serial_num;
for (i = 0; addr = NETXEN_USER_START +
i < sizeof(struct netxen_new_user_info) / sizeof(u32); offsetof(struct netxen_new_user_info, serial_num);
i++) { for (i = 0; i < 8; i++) {
if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) { if (netxen_rom_fast_read(adapter, addr, ptr32) == -1) {
printk("%s: ERROR reading %s board userarea.\n", printk("%s: ERROR reading %s board userarea.\n",
netxen_nic_driver_name, netxen_nic_driver_name,
@@ -1163,10 +1163,11 @@ void netxen_nic_flash_print(struct netxen_adapter *adapter)
ptr32++; ptr32++;
addr += sizeof(u32); addr += sizeof(u32);
} }
get_brd_name_by_type(board_info->board_type, brd_name); get_brd_name_by_type(board_info->board_type, brd_name);
printk("NetXen %s Board S/N %s Chip id 0x%x\n", printk("NetXen %s Board S/N %s Chip id 0x%x\n",
brd_name, user_info.serial_num, board_info->chip_id); brd_name, serial_num, board_info->chip_id);
printk("NetXen %s Board #%d, Chip id 0x%x\n", printk("NetXen %s Board #%d, Chip id 0x%x\n",
board_info->board_type == 0x0b ? "XGB" : "GBE", board_info->board_type == 0x0b ? "XGB" : "GBE",