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

Commit e7473f12 authored by Amit Kumar Salecha's avatar Amit Kumar Salecha Committed by David S. Miller
Browse files

netxen: fix merge 9b963e5d 



Patch "fix memory initialization:5d521fd3" didn't got merge.

Signed-off-by: default avatarAmit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 906bb26c

drivers/net/netxen/netxen_nic_init.c

+2 −0
Original line number Diff line number Diff line
@@ -528,6 +528,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter) 
				continue;

			if (off == (ROMUSB_GLB + 0x1c)) /* MS clock */

				continue;

			if ((off & 0x0ff00000) == NETXEN_CRB_DDR_NET)

				continue;

			if (off == (NETXEN_CRB_PEG_NET_1 + 0x18) &&

				!NX_IS_REVISION_P3P(adapter->ahw.revision_id))

				buf[i].data = 0x1020;