From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E248B1171A for ; Mon, 21 Aug 2023 20:07:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 62AE4C433C7; Mon, 21 Aug 2023 20:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1692648438; bh=4QnqED9HyCmTPU9FpVcVZEjLMg3SGtTLBBbUlIDLS4g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lhMZhmJhAm344UyQ3gYymKZhK/o3MVfWQZ5BhZKcdSFXHm3Fnj7M1HK24zNNJbdZ8 DRx0i0LRLMoWms5SjndL5l/ki7p8jfcUXNNFYSErZSecb0YENctKaaRzgjv+ZnMhzv 1yfKeKDGeECSf6CWFqCMgTPavHu3XugSqyTSxcrA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Martin Habets , Edward Cree , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.4 175/234] sfc: dont fail probe if MAE/TC setup fails Date: Mon, 21 Aug 2023 21:42:18 +0200 Message-ID: <20230821194136.579148912@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230821194128.754601642@linuxfoundation.org> References: <20230821194128.754601642@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Edward Cree [ Upstream commit 54c9016eb8eda55952a195b071359cd13f50ed9b ] Existing comment in the source explains why we don't want efx_init_tc() failure to be fatal. Cited commit erroneously consolidated failure paths causing the probe to be failed in this case. Fixes: 7e056e2360d9 ("sfc: obtain device mac address based on firmware handle for ef100") Reviewed-by: Martin Habets Signed-off-by: Edward Cree Link: https://lore.kernel.org/r/aa7f589dd6028bd1ad49f0a85f37ab33c09b2b45.1692114888.git.ecree.xilinx@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/sfc/ef100_nic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/sfc/ef100_nic.c b/drivers/net/ethernet/sfc/ef100_nic.c index 7adde9639c8ab..35d8e9811998d 100644 --- a/drivers/net/ethernet/sfc/ef100_nic.c +++ b/drivers/net/ethernet/sfc/ef100_nic.c @@ -1194,7 +1194,7 @@ int ef100_probe_netdev_pf(struct efx_nic *efx) net_dev->features |= NETIF_F_HW_TC; efx->fixed_features |= NETIF_F_HW_TC; } - return rc; + return 0; } int ef100_probe_vf(struct efx_nic *efx) -- 2.40.1