From: Roopa Prabhu <roprabhu@cisco.com>
Date: Thu, 19 Jan 2012 22:25:36 +0000 (+0000)
Subject: enic: fix compile when CONFIG_PCI_IOV is not enabled
X-Git-Tag: v2.6.39-400.9.0~338^2~46
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=156206497e7c57bb79aa26f9ea0053fa1f326a8f;p=users%2Fjedix%2Flinux-maple.git

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>
(cherry picked from commit b67f231ded332461dd31123c4f659c4681223fb1)
Signed-off-by: Roopa Prabhu <roprabhu@cisco.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Joe Jin <joe.jin@oracle.com>
---

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index ea1643806ef0..e620128a450d 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -2279,7 +2279,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.
@@ -2386,11 +2386,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) {