Skip to content

Commit

Permalink
enic: fix compile when CONFIG_PCI_IOV is not enabled
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Roopa Prabhu authored and David S. Miller committed Jan 20, 2012
1 parent 3d8fe98 commit b67f231
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/ethernet/cisco/enic/enic_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2273,7 +2273,7 @@ static int __devinit enic_probe(struct pci_dev *pdev,
#ifdef CONFIG_PCI_IOV
int pos = 0;
#endif
int num_pps;
int num_pps = 1;

/* Allocate net device structure and initialize. Private
* instance data is initialized to zero.
Expand Down Expand Up @@ -2380,11 +2380,11 @@ static int __devinit enic_probe(struct pci_dev *pdev,
goto err_out_vnic_unregister;
}
enic->priv_flags |= ENIC_SRIOV_ENABLED;
num_pps = enic->num_vfs;
}
}
#endif

num_pps = enic->num_vfs ? enic->num_vfs : 1;
/* Allocate structure for port profiles */
enic->pp = kcalloc(num_pps, sizeof(*enic->pp), GFP_KERNEL);
if (!enic->pp) {
Expand Down

0 comments on commit b67f231

Please sign in to comment.