adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

netxen: fix merge 9b963e5d0e

Browse source 
Patch "fix memory initialization:5d521fd36de4e61" didn't got merge.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amit Kumar Salecha 2009-11-29 21:54:55 -08:00 committed by David S. Miller
parent 906bb26c06
commit e7473f12be
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/net/netxen/netxen_nic_init.c
View file

@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter)
continue; continue;
if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */ if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */
continue; continue;
if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)
continue;
if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) && if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&
!NX_IS_REVISION_P3P(adapter->ahw.revision_id)) !NX_IS_REVISION_P3P(adapter->ahw.revision_id))
buf[i].data = 0x1020; buf[i].data = 0x1020;