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=-10.0 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=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 82439C433DF for ; Tue, 23 Jun 2020 21:26:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5688C20781 for ; Tue, 23 Jun 2020 21:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592947561; bh=PE7Z++9CtFSGHnUPbe+vMfnKMjQfrC6E6jUfYSx6lXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=CXgmfJx3gpUfMWfDYEj1AmbBpY/6xcICUOtgsLku3U/RYIgq8EeUxTvC8qN1RwC+h p2v2mJflA+r4kwKzwjLm3qdHHYFAMaEY2VlijwZc/Vi5wSfJ+sQGBC6sHo0cF7B9gC 43yec7spMIvoGaOt/+7Op8MUCJe6F45KOhQMkjXQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389686AbgFWV0A (ORCPT ); Tue, 23 Jun 2020 17:26:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:35398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389670AbgFWUS2 (ORCPT ); Tue, 23 Jun 2020 16:18:28 -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 0FF6B20EDD; Tue, 23 Jun 2020 20:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943508; bh=PE7Z++9CtFSGHnUPbe+vMfnKMjQfrC6E6jUfYSx6lXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mThyvJO5DQe27M5Hv+Oawg7tv+6j2Cj90BmhOOkmQSIRSQJ977nkSE8P3xzo+n8Jk /31JccYhJp4BrWrFg65KAi/XCv1CMthzrhMkQXrM+K1N7PMTMVw0SYwNjw+yVE4ZLE YM19GxXe68dujf1tKOST4R0WFUkgKioPuxrhcVKg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasundhara Volam , Michael Chan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 402/477] bnxt_en: Return from timer if interface is not in open state. Date: Tue, 23 Jun 2020 21:56:39 +0200 Message-Id: <20200623195426.532767501@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@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 From: Vasundhara Volam [ Upstream commit e000940473d1423a42ef9c823fb23ccffe3f07ea ] This will avoid many uneccessary error logs when driver or firmware is in reset. Fixes: 230d1f0de754 ("bnxt_en: Handle firmware reset.") Signed-off-by: Vasundhara Volam Signed-off-by: Michael Chan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index a29bf3ca0b48e..19c4a0a5727a4 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -10014,7 +10014,7 @@ static void bnxt_timer(struct timer_list *t) struct bnxt *bp = from_timer(bp, t, timer); struct net_device *dev = bp->dev; - if (!netif_running(dev)) + if (!netif_running(dev) || !test_bit(BNXT_STATE_OPEN, &bp->state)) return; if (atomic_read(&bp->intr_sem) != 0) -- 2.25.1