From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9043C48BD6 for ; Thu, 27 Jun 2019 00:32:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A660D217D7 for ; Thu, 27 Jun 2019 00:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595573; bh=x0tnoCKzwMTbTEg97X/tWGRnfg/9tEHvhYDSiwOpIs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=2tCFBC7ZqaBB6lAYdtg80rIuXtM2E/7xfxXw7P4Pj6TrcwY6yHLqfmar2mWiEFnu6 ydJtpgnOCm2HZug3LePmWGuX/nKhNR8zwOxsGaMWVo666R9rX2jD2NHn7c51++jSUt L4ymGMt69T07piHyyKRwgoVsFrpwb3ysXloG3vMM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727028AbfF0Acx (ORCPT ); Wed, 26 Jun 2019 20:32:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:36642 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727038AbfF0Acu (ORCPT ); Wed, 26 Jun 2019 20:32:50 -0400 Received: from sasha-vm.mshome.net (unknown [107.242.116.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C720A216E3; Thu, 27 Jun 2019 00:32:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595569; bh=x0tnoCKzwMTbTEg97X/tWGRnfg/9tEHvhYDSiwOpIs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iKolNvQhiTm1XqfpMo0hQSqXLhpsx5ozSaqbqMllXtC93Iue0yIy5W02DU9Wxfn8r oLDFfCjM0YfN7LDY9YyMheSodv+wVI/GJfh1isqwArj5Jh4AbYBMv67/GXmqYSryej 3Ccg14aeLo7aYiBwJPIRpfrJMdmMIDm8WgoYFfok= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Thomas Falcon , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.1 43/95] ibmvnic: Do not close unopened driver during reset Date: Wed, 26 Jun 2019 20:29:28 -0400 Message-Id: <20190627003021.19867-43-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003021.19867-1-sashal@kernel.org> References: <20190627003021.19867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Thomas Falcon [ Upstream commit 1f94608b0ce141be5286dde31270590bdf35b86a ] Check driver state before halting it during a reset. If the driver is not running, do nothing. Otherwise, a request to deactivate a down link can cause an error and the reset will fail. Signed-off-by: Thomas Falcon Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/ibm/ibmvnic.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 3dfb2d131eb7..71bf895409a1 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1751,7 +1751,8 @@ static int do_reset(struct ibmvnic_adapter *adapter, ibmvnic_cleanup(netdev); - if (adapter->reset_reason != VNIC_RESET_MOBILITY && + if (reset_state == VNIC_OPEN && + adapter->reset_reason != VNIC_RESET_MOBILITY && adapter->reset_reason != VNIC_RESET_FAILOVER) { rc = __ibmvnic_close(netdev); if (rc) -- 2.20.1