From: Vasundhara Volam <vasundhara.volam@xxxxxxxxxx> The pci_assigned_vfs() check (while disabling VFs) is being moved to the pci-sysfs.c file and will be done before invoking sriov_configure(). Signed-off-by: Vasundhara Volam <vasundhara.volam@xxxxxxxxxx> Signed-off-by: Sathya Perla <sathya.perla@xxxxxxxxxx> --- .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c index a29538b..9802914 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c @@ -465,16 +465,6 @@ static int qlcnic_pci_sriov_disable(struct qlcnic_adapter *adapter) { struct net_device *netdev = adapter->netdev; - if (pci_vfs_assigned(adapter->pdev)) { - netdev_err(adapter->netdev, - "SR-IOV VFs belonging to port %d are assigned to VMs. SR-IOV can not be disabled on this port\n", - adapter->portnum); - netdev_info(adapter->netdev, - "Please detach SR-IOV VFs belonging to port %d from VMs, and then try to disable SR-IOV on this port\n", - adapter->portnum); - return -EPERM; - } - qlcnic_sriov_pf_disable(adapter); rtnl_lock(); -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html