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=unavailable 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 991EFC48BD6 for ; Thu, 27 Jun 2019 00:48:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 712A62082F for ; Thu, 27 Jun 2019 00:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561596537; bh=Qdm9uK8OmlgNK/z8GGyZRklXyMDyYyXWxp2APb7NQzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gfXbg1bAc+mRgS/dubA4FoNn30yCDoPwQZ9B2l0TW+Xjngt86B8moyLLYYZTWU4je u0D6kDPLZXfPAgt7STOrzuIpZEKiPkKYIygQ3YfuPfVsPcuTNWvYO7SitWxuRraVer St15FYhjWBzcPS+7XLwR2ASqpTTUuRTf+E7kL/U4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728657AbfF0Ahk (ORCPT ); Wed, 26 Jun 2019 20:37:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:42092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728644AbfF0Ahj (ORCPT ); Wed, 26 Jun 2019 20:37:39 -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 07193217F9; Thu, 27 Jun 2019 00:37:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561595858; bh=Qdm9uK8OmlgNK/z8GGyZRklXyMDyYyXWxp2APb7NQzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0ywkzFjGInQJYGpx/UjUHR+cOWB8BMnPLBi7TBt5vFM04EXPEWRwrRWVdfN80EdLJ VYBzXvBjzTPXXpvH7vKwqKpWS8iXlSIfT0ZIQoQpABhUZyGy6Qo6dAs36VOwN1o13I To9AcGI8jUgjZNQznMKoSzX/fBaScd1hy4H0mjEw= 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 4.19 26/60] ibmvnic: Do not close unopened driver during reset Date: Wed, 26 Jun 2019 20:35:41 -0400 Message-Id: <20190627003616.20767-26-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190627003616.20767-1-sashal@kernel.org> References: <20190627003616.20767-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 426789e2c23d..bf0a5fe0da17 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1754,7 +1754,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