From fa3f8fcd3ce8efd99988a359fc9a3ac78becf5c4 Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Sun, 29 Nov 2009 21:54:55 -0800 Subject: [PATCH] --- yaml --- r: 172029 b: refs/heads/master c: e7473f12be7712aafe6df163222f26caadee1175 h: refs/heads/master i: 172027: add2d4e95a181a61178acdbb485d8a65ac069ff9 v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_init.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bfb518f62647..76faef9fa7c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 906bb26c0624d87df74e6642f2d74cde176fcc12 +refs/heads/master: e7473f12be7712aafe6df163222f26caadee1175 diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c index 6ee27a630d89..80a667460514 100644 --- a/trunk/drivers/net/netxen/netxen_nic_init.c +++ b/trunk/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;