redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

enic: fix compile when CONFIG_PCI_IOV is not enabled 

reverting back change that access enic->num_vfs outside
CONFIG_PCI_IOV

Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Roopa Prabhu 2012-01-19 22:25:36 +00:00 committed by David S. Miller
parent 3d8fe98f8d
commit b67f231ded
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/cisco/enic/enic_main.c
View File

@ -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,
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) {