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.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D93B7C742BB for ; Fri, 12 Jul 2019 12:39:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B3812208E4 for ; Fri, 12 Jul 2019 12:39:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562935188; bh=jnfapKDAJb2wo6tU6rPlft0yXV1aRdTj1hfyQPk7CqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cYsrF/cfnO1aKz4U+wZ4h0jfseTdqr8Ax9wGdUS1KN43RqQrNgsB82r0JOWHkWnQ6 lmWQa1/h5dZewh81c5PJq60QU5rlwCaDfARieIlwY9JVZtDgLu1CqUjrnYPr+6BmEw ZOVXBWD1rT7Z/oeEAgmC8s3icSKt04TbTKFyGfB8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727421AbfGLM0a (ORCPT ); Fri, 12 Jul 2019 08:26:30 -0400 Received: from mail.kernel.org ([198.145.29.99]:37732 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727561AbfGLM03 (ORCPT ); Fri, 12 Jul 2019 08:26:29 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2E1BD2084B; Fri, 12 Jul 2019 12:26:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1562934388; bh=jnfapKDAJb2wo6tU6rPlft0yXV1aRdTj1hfyQPk7CqE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nq5BPMrbWw/pTsbGFhXg43jktsWGbgbMduSQRkpefTWraGJHSThhwSDbPf7wAOBsD cFdy0USIR7UUPatNG5MGbJzZTioaDCm4sFfXpa1IhAdFjMABicv/Hz3Onl03r/pfQG InkhWv11DyCp2yYwSD7g78PW+MjR2n8x3nDCQFYU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Falcon , "David S. Miller" , Sasha Levin Subject: [PATCH 5.1 040/138] ibmvnic: Do not close unopened driver during reset Date: Fri, 12 Jul 2019 14:18:24 +0200 Message-Id: <20190712121630.214132491@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190712121628.731888964@linuxfoundation.org> References: <20190712121628.731888964@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ 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