From patchwork Wed Jan 2 13:36:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ariel Elior X-Patchwork-Id: 209045 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.180.67]) by ozlabs.org (Postfix) with ESMTP id B04FE2C0080 for ; Thu, 3 Jan 2013 00:33:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752694Ab3ABNdb (ORCPT ); Wed, 2 Jan 2013 08:33:31 -0500 Received: from mms3.broadcom.com ([216.31.210.19]:2738 "EHLO mms3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752682Ab3ABNd3 (ORCPT ); Wed, 2 Jan 2013 08:33:29 -0500 Received: from [10.9.200.133] by mms3.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.5)); Wed, 02 Jan 2013 05:28:26 -0800 X-Server-Uuid: B86B6450-0931-4310-942E-F00ED04CA7AF Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Wed, 2 Jan 2013 05:33:10 -0800 Received: from lb-tlvb-pcie37.il.broadcom.com ( lb-tlvb-pcie37.il.broadcom.com [10.185.6.30]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 30B9F40FE6; Wed, 2 Jan 2013 05:33:21 -0800 (PST) From: "Ariel Elior" To: "David Miller" cc: netdev , eilong@broadcom.com, "Ariel Elior" Subject: [PATCH net-next] bnx2x: Fix compilation when CONFIG_PCI_IOV is not defined Date: Wed, 2 Jan 2013 15:36:25 +0200 Message-ID: <1357133785-9569-1-git-send-email-ariele@broadcom.com> X-Mailer: git-send-email 1.7.9.GIT MIME-Version: 1.0 X-WSS-ID: 7CFAEA7039W21344542-01-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch ifdefs out the use of PCI_IOV_RESOURCES which exists in the kernel only when CONFIG_PCI_IOV is defined. There is no point in doing the same for the invocation of SRIOV functionality in the driver as it will be immediately failed by a kernel which was thus compiled. Signed-off-by: Ariel Elior --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index 71fcef0..2142839 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c @@ -1792,6 +1792,7 @@ static int bnx2x_vf_devfn(struct bnx2x *bp, int vfid) static void bnx2x_vf_set_bars(struct bnx2x *bp, struct bnx2x_virtf *vf) { +#ifdef CONFIG_PCI_IOV int i, n; struct pci_dev *dev = bp->pdev; struct bnx2x_sriov *iov = &bp->vfdb->sriov; @@ -1804,6 +1805,7 @@ static void bnx2x_vf_set_bars(struct bnx2x *bp, struct bnx2x_virtf *vf) vf->bars[n].bar = start + size * vf->abs_vfid; vf->bars[n].size = size; } +#endif /* CONFIG_PCI_IOV */ } static int bnx2x_ari_enabled(struct pci_dev *dev)