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.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 E4377C7618B for ; Fri, 26 Jul 2019 13:44:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B42DE22CD0 for ; Fri, 26 Jul 2019 13:44:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148645; bh=neU+KPgUJ+aeKz64xdDye6EMKJnpcX9ePEn4aV9DERk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Xgoth3t4jcVJzPfwNpuS7Nl0SyNam1SL+dWZYcdA0NM/TQmw0ittoZZesUOeZlgOO 0YsuamP52NWFdeW+HIP5+rXB47xmxVhIsoBS0ulmC9RK6jcW+GGwo9ytzJt03S3STW DFs+z+GPtEuiZeEsVADRZEGpLd1tk+wtZ78K85MM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727977AbfGZNoE (ORCPT ); Fri, 26 Jul 2019 09:44:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:52012 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727922AbfGZNoA (ORCPT ); Fri, 26 Jul 2019 09:44:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 0F0F122CD2; Fri, 26 Jul 2019 13:43:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148639; bh=neU+KPgUJ+aeKz64xdDye6EMKJnpcX9ePEn4aV9DERk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CcWBQ/j+pMeRvvZPgnh1iAhD3UM3Pkqgg8apYFS/aADCyfo76Wbs39QMTL4zI3Iob O5W/WFoW06y8pxPvNgUh9guONZawhjkPXWv9IWpimIQW6GrpDurs6BAUbfor7gZAO9 iPp551Xvjg+czRBt+kh83CTd2+FW19ocK6hwS998= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Benjamin Poirier , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 20/37] be2net: Signal that the device cannot transmit during reconfiguration Date: Fri, 26 Jul 2019 09:43:15 -0400 Message-Id: <20190726134332.12626-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726134332.12626-1-sashal@kernel.org> References: <20190726134332.12626-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Benjamin Poirier [ Upstream commit 7429c6c0d9cb086d8e79f0d2a48ae14851d2115e ] While changing the number of interrupt channels, be2net stops adapter operation (including netif_tx_disable()) but it doesn't signal that it cannot transmit. This may lead dev_watchdog() to falsely trigger during that time. Add the missing call to netif_carrier_off(), following the pattern used in many other drivers. netif_carrier_on() is already taken care of in be_open(). Signed-off-by: Benjamin Poirier Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/emulex/benet/be_main.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 39f399741647..cabeb1790db7 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4600,8 +4600,12 @@ int be_update_queues(struct be_adapter *adapter) struct net_device *netdev = adapter->netdev; int status; - if (netif_running(netdev)) + if (netif_running(netdev)) { + /* device cannot transmit now, avoid dev_watchdog timeouts */ + netif_carrier_off(netdev); + be_close(netdev); + } be_cancel_worker(adapter); -- 2.20.1