From 6dedec818ac2a3783581a761b0680e713f78afde Mon Sep 17 00:00:00 2001 From: Ajit Khaparde Date: Thu, 29 Jul 2010 06:15:32 +0000 Subject: be2net: fix to correctly know if driver needs to run for a VF or a PF 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 Signed-off-by: David S. Miller --- drivers/net/benet/be_main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index d5b097d836b9..e72b482c4327 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; } -- cgit v1.2.1