From patchwork Mon Nov 30 04:01:15 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: amit salecha X-Patchwork-Id: 39781 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5518B1007D2 for ; Mon, 30 Nov 2009 15:01:24 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753180AbZK3EBK (ORCPT ); Sun, 29 Nov 2009 23:01:10 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753143AbZK3EBK (ORCPT ); Sun, 29 Nov 2009 23:01:10 -0500 Received: from mvnat01.qlogic.com ([198.186.3.73]:45225 "HELO unm84.unmin.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1753126AbZK3EBJ (ORCPT ); Sun, 29 Nov 2009 23:01:09 -0500 Received: by unm84.unmin.com (Postfix, from userid 787) id 68CBAE8B23; Sun, 29 Nov 2009 20:01:15 -0800 (PST) From: Amit Kumar Salecha To: davem@davemloft.net Cc: netdev@vger.kernel.org, dhananjay.phadke@qlogic.com Subject: [PATCH NEXT] netxen: fix merge 9b963e5d0e01461099a Date: Sun, 29 Nov 2009 20:01:15 -0800 Message-Id: <1259553675-14546-1-git-send-email-amit.salecha@qlogic.com> X-Mailer: git-send-email 1.6.0.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Patch "fix memory initialization:5d521fd36de4e61" didn't got merge. Signed-off-by: Amit Kumar Salecha --- drivers/net/netxen/netxen_nic_init.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) 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;