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,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 78252C7618B for ; Fri, 26 Jul 2019 13:40:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 482B622BE8 for ; Fri, 26 Jul 2019 13:40:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148459; bh=4K0/PokKs96CriHHqnGm0AfBmcQdKLj/goskU7lYKmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Z5/VdIVWFPShDFQNLE2113T6aPNcxY9MgQ6tBCROgf3FXPTaR+NI0NxioEis7m1XX EDYOFpmn8gyEqCirGTpjKCVAzq0BFr3KevxcobWjsNYk20jtioTFFUdmM2Koi0XHkN iF6jvNi+q8bBYk0sT6Hh4zXqQmIBJD1lhHJ1aTf8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387629AbfGZNk6 (ORCPT ); Fri, 26 Jul 2019 09:40:58 -0400 Received: from mail.kernel.org ([198.145.29.99]:47146 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387613AbfGZNky (ORCPT ); Fri, 26 Jul 2019 09:40:54 -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 28D6522CBD; Fri, 26 Jul 2019 13:40:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148453; bh=4K0/PokKs96CriHHqnGm0AfBmcQdKLj/goskU7lYKmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2A2fVa9RhlG4Arl60GEIThNu3lTFkPLooqp/q2nVuBNmhZmaEkhSyv/8GrLBhV8kS KCIMpjINzWa4kSUhL9/aEih/4kTGP5iD49xFBtaphgM1igBgYDhZmVF8ZNjjQ2fMJ3 uNNj+NCp3xvTSMBh9QB99z51Ukj1KUbZ4Aqz8a8k= 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 5.2 49/85] be2net: Signal that the device cannot transmit during reconfiguration Date: Fri, 26 Jul 2019 09:38:59 -0400 Message-Id: <20190726133936.11177-49-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726133936.11177-1-sashal@kernel.org> References: <20190726133936.11177-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 82015c8a5ed7..b7a246b33599 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c @@ -4697,8 +4697,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