From patchwork Mon Oct 12 02:43:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dhananjay Phadke X-Patchwork-Id: 35727 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 0C615B6F2B for ; Mon, 12 Oct 2009 13:45:21 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752600AbZJLCn7 (ORCPT ); Sun, 11 Oct 2009 22:43:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751938AbZJLCn7 (ORCPT ); Sun, 11 Oct 2009 22:43:59 -0400 Received: from mvnat01.qlogic.com ([198.186.3.73]:40978 "HELO unm84.unmin.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with SMTP id S1750831AbZJLCn7 (ORCPT ); Sun, 11 Oct 2009 22:43:59 -0400 Received: by unm84.unmin.com (Postfix, from userid 720) id 8DAC3E8B1A; Sun, 11 Oct 2009 19:43:22 -0700 (PDT) From: Dhananjay Phadke To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH] netxen: fix pci bar mapping Date: Sun, 11 Oct 2009 19:43:22 -0700 Message-Id: <1255315402-1578-1-git-send-email-dhananjay@netxen.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 Use phys_addr_t data type for pci resource address instead of unsigned long. This fixes mapping of pci resources where resource addresses can be larger than word size (e.g. PAE). Signed-off-by: Dhananjay Phadke --- drivers/net/netxen/netxen_nic_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 9b9eab1..194b3e3 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -595,7 +595,8 @@ netxen_setup_pci_map(struct netxen_adapter *adapter) void __iomem *mem_ptr2 = NULL; void __iomem *db_ptr = NULL; - unsigned long mem_base, mem_len, db_base, db_len = 0, pci_len0 = 0; + phys_addr_t mem_base, db_base; + unsigned long mem_len, db_len = 0, pci_len0 = 0; struct pci_dev *pdev = adapter->pdev; int pci_func = adapter->ahw.pci_func;