Commit b67f231d authored by Roopa Prabhu's avatar Roopa Prabhu Committed by David S. Miller

enic: fix compile when CONFIG_PCI_IOV is not enabled

reverting back change that access enic->num_vfs outside
CONFIG_PCI_IOV
Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3d8fe98f
...@@ -2273,7 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev, ...@@ -2273,7 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
#ifdef CONFIG_PCI_IOV #ifdef CONFIG_PCI_IOV
int pos = 0; int pos = 0;
#endif #endif
int num_pps; int num_pps = 1;
/* Allocate net device structure and initialize. Private /* Allocate net device structure and initialize. Private
* instance data is initialized to zero. * instance data is initialized to zero.
...@@ -2380,11 +2380,11 @@ static int __devinit enic_probe(struct pci_dev *pdev, ...@@ -2380,11 +2380,11 @@ static int __devinit enic_probe(struct pci_dev *pdev,
goto err_out_vnic_unregister; goto err_out_vnic_unregister;
} }
enic->priv_flags |= ENIC_SRIOV_ENABLED; enic->priv_flags |= ENIC_SRIOV_ENABLED;
num_pps = enic->num_vfs;
} }
} }
#endif #endif
num_pps = enic->num_vfs ? enic->num_vfs : 1;
/* Allocate structure for port profiles */ /* Allocate structure for port profiles */
enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL); enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
if (!enic->pp) { if (!enic->pp) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment