From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 30 Nov 2009 05:54:55 +0000 (-0800)
Subject: netxen: fix merge 9b963e5d0e01461099a
X-Git-Tag: v3.12-rc1~12159^2~128
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e7473f12be7712aafe6df163222f26caadee1175;p=kernel%2Fkernel-generic.git

netxen: fix merge 9b963e5d0e01461099a

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>
---

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 6ee27a6..80a6674 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -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;