From patchwork Mon Nov 10 11:53:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sathya Perla X-Patchwork-Id: 408898 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B2BF7140179 for ; Mon, 10 Nov 2014 22:52:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752603AbaKJLwB (ORCPT ); Mon, 10 Nov 2014 06:52:01 -0500 Received: from cmexedge1.emulex.com ([138.239.224.99]:50288 "EHLO CMEXEDGE1.ext.emulex.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752161AbaKJLv7 (ORCPT ); Mon, 10 Nov 2014 06:51:59 -0500 Received: from CMEXHTCAS1.ad.emulex.com (138.239.115.217) by CMEXEDGE1.ext.emulex.com (138.239.224.99) with Microsoft SMTP Server (TLS) id 14.3.174.1; Mon, 10 Nov 2014 03:51:37 -0800 Received: from S84.emulex.com.com (10.192.238.84) by smtp.emulex.com (138.239.115.207) with Microsoft SMTP Server id 14.3.174.1; Mon, 10 Nov 2014 03:51:34 -0800 From: Sathya Perla To: , CC: , , , Subject: [PATCH 4/4] qlcnic: remove pci_assigned_vfs() check while disabling VFs Date: Mon, 10 Nov 2014 17:23:30 +0530 Message-ID: <1415620410-4937-5-git-send-email-sathya.perla@emulex.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1415620410-4937-1-git-send-email-sathya.perla@emulex.com> References: <1415620410-4937-1-git-send-email-sathya.perla@emulex.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Vasundhara Volam 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 Signed-off-by: Sathya Perla --- .../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();