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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 22563C4321E for ; Fri, 1 Apr 2022 14:33:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347438AbiDAOfU (ORCPT ); Fri, 1 Apr 2022 10:35:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347575AbiDAOdM (ORCPT ); Fri, 1 Apr 2022 10:33:12 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9297724CEC8; Fri, 1 Apr 2022 07:29:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 10B64B82507; Fri, 1 Apr 2022 14:29:48 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88777C3410F; Fri, 1 Apr 2022 14:29:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1648823386; bh=ySVrWsjulLcefukWR3pFU5t5RVhHuP88YJD0SGNRDxI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UUl7FWHH4+EZKPWTNufVg1dUhni6nuX1Wx5dznBRjBEhE4Ws7wfp40Bmlfw8H68By x/tnLlxVakAjyw9FHLFq1/464CLYf/PEWxb7tKLKN0y/vUpXMqgIKpa/SWLfmHa9Qb wInXiGwYUju8wn6VmHbebY8q7f7ALaoAIu1xuYfN1YGXj5l0MIBw4c7hIMOd9S8EYQ /UuefELX60Z6Nfnc/toX5ywJv9uVxKa0ZdIe9guku2ba/IK6S3tGxxIvRCAfZ0RuFI nyyn9APP1nWRAFtWGbqlEW1wXgUnMV5zpJIsRIK0qz6anVkIdebZuzhonxH5j9Lcz2 LeZDR1jLlkWnQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxim Mikityanskiy , Tariq Toukan , Saeed Mahameed , Sasha Levin , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 074/149] net/mlx5e: Disable TX queues before registering the netdev Date: Fri, 1 Apr 2022 10:24:21 -0400 Message-Id: <20220401142536.1948161-74-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220401142536.1948161-1-sashal@kernel.org> References: <20220401142536.1948161-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Maxim Mikityanskiy [ Upstream commit d08c6e2a4d0308a7922d7ef3b1b3af45d4096aad ] Normally, the queues are disabled when the channels are deactivated, and enabled when the channels are activated. However, on register, the channels are not active, but the queues are enabled by default. This change fixes it, preventing mlx5e_xmit from running when the channels are deactivated in the beginning. Signed-off-by: Maxim Mikityanskiy Reviewed-by: Tariq Toukan Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index 3667f5ef5990..169e3524bb1c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -5345,6 +5345,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof } netif_carrier_off(netdev); + netif_tx_disable(netdev); dev_net_set(netdev, mlx5_core_net(mdev)); return netdev; -- 2.34.1