Patchwork [net-next,1/4] be2net: fix to correctly know if driver needs to run for a VF or a PF

login
register
mail settings
Submitter Ajit Khaparde
Date July 29, 2010, 4:15 p.m.
Message ID <20100729161522.GA15448@serverengines.com>
Download mbox | patch
Permalink /patch/60278/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ajit Khaparde - July 29, 2010, 4:15 p.m.
Move be_check_sriov_fn_type to appropriate place to correctly determine
if the be2net driver needs to work as a VF driver or a PF driver.

Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>
---
 drivers/net/benet/be_main.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
David Miller - July 31, 2010, 6:59 a.m.
From: Ajit Khaparde <ajitk@serverengines.com>
Date: Thu, 29 Jul 2010 21:45:32 +0530

> Move be_check_sriov_fn_type to appropriate place to correctly determine
> if the be2net driver needs to work as a VF driver or a PF driver.
> 
> Signed-off-by: Ajit Khaparde <ajitk@serverengines.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index d5b097d..e72b482 100644
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@ -1717,10 +1717,11 @@  static void be_msix_enable(struct be_adapter *adapter)
 
 static void be_sriov_enable(struct be_adapter *adapter)
 {
-#ifdef CONFIG_PCI_IOV
-	int status;
 	be_check_sriov_fn_type(adapter);
+#ifdef CONFIG_PCI_IOV
 	if (be_physfn(adapter) && num_vfs) {
+		int status;
+
 		status = pci_enable_sriov(adapter->pdev, num_vfs);
 		adapter->sriov_enabled = status ? false : true;
 	}