aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Rose <gregory.v.rose@intel.com>2014-04-04 00:43:16 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2014-05-21 07:01:30 -0400
commitdf805f62d16db15fdb9278bcb56ee3863deebfb8 (patch)
tree8e1e1a80c651a77ae85648668a21f825f58454ea
parentc0c8a202c958370ea246e8bf68abd46cce7e93b5 (diff)
i40e: Check PCI_IOV config to avoid compile error
The call to i40e_alloc_vfs needs to be wrapped in CONFIG_PCI_IOV because the function itself is wrapped in the same conditional compile block. Change-ID: I663c5f1b85e5cfba0b36da8966f7db1a034f408b Signed-off-by: Greg Rose <gregory.v.rose@intel.com> Tested-by: Kavindya Deegala <kavindya.s.deegala@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/i40e/i40e_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index e965cc543df1..0b34e8b31cbd 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -8368,6 +8368,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
8368 } 8368 }
8369 } 8369 }
8370 8370
8371#ifdef CONFIG_PCI_IOV
8371 /* prep for VF support */ 8372 /* prep for VF support */
8372 if ((pf->flags & I40E_FLAG_SRIOV_ENABLED) && 8373 if ((pf->flags & I40E_FLAG_SRIOV_ENABLED) &&
8373 (pf->flags & I40E_FLAG_MSIX_ENABLED) && 8374 (pf->flags & I40E_FLAG_MSIX_ENABLED) &&
@@ -8390,6 +8391,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
8390 err); 8391 err);
8391 } 8392 }
8392 } 8393 }
8394#endif /* CONFIG_PCI_IOV */
8393 8395
8394 pfs_found++; 8396 pfs_found++;
8395 8397