Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2379466lqp; Sun, 24 Mar 2024 16:48:10 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWq8L9h+2FpOAJoG++K95UCCMYlz03++PR5PFtEJPFa+vdN1GQSSoJzpgnQFoIAmxx0QS9fXWJyawBoBXcDws5v04kixNcNg4HPbcjKzw== X-Google-Smtp-Source: AGHT+IEazmUIoGBYTlR6vmY6EF46p40WYK0apAAXzyv9SA7EhyFTLv34z/qgeSKcGidEfd4DbUlR X-Received: by 2002:a17:906:8cc:b0:a47:3f10:b3c8 with SMTP id o12-20020a17090608cc00b00a473f10b3c8mr4212106eje.26.1711324090352; Sun, 24 Mar 2024 16:48:10 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711324090; cv=pass; d=google.com; s=arc-20160816; b=Nqacg2zxdM8yBDc39UXgrMGIHYwbtgeuroQFEtyF79z58rugLf0Qo4GaRGllr9NMJP HkHyIUU4LBNS7iR3IaKBv5+7B1eh61VVHyJe0UnouC4pwsxTjlP210CXiUNRyYj34c5o DadfDvXVbCWgf1FOrkmuiILtHNUrlEcURYgbyRbROoRBKTngNWje4kBnP3u9tA+jK+oQ Saj4EIBY52Pfq81g1Wmr2PskDgtntmpYnUXMLvRFeFoaCoejGIM39qHQL7ebCUDzufB0 9FP1QFc7+PcvX16UkQH7Ui1WKd9WGQsMW82yE1icZOv/SFD2RCctmvQ3e2iGYmiJ/Fbz o4pw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=mXtYgWhFKsP2UOyDI1dn9Ww5Tf9e8IIam4+Iq0IusPk=; fh=ZnIFBs2g1tIfadmeZMmxnvVipy4OeDSUSlqyLvip1xc=; b=SrMAMmjNwq1Csvc+dodHfyI+NSKPIFdfQ8lbpFrZ3PNGDLJ2Ix22cCPq2WIKH+JEeP 8BwcCcMxhpCj/17zd60yAuIsquDJB1lB4zwhxf0gcByP+47nlR57Y0YvGPtceZcfm59R J8W3XKPWzxACS0J0zdG+PvJCmiAXQbMjSmZMTPAXlcG/jXR9RvRussLz8E9GBal9z0QM Jqji9Jevlcm+XmCO2hv43R4QvGLp+Jwk9NAzqsdZSWPJqzQUwkH2ySXrNJvkX62Vdm8a preeaUrizuOw7jLCuqdawTmAMMxssvkns0/Ctqii/99hAMNuupazErWEZmLZZW1EAgpP SOaw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H4gVxb9E; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113221-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113221-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c23-20020a170906529700b00a4747bdb536si1602586ejm.255.2024.03.24.16.48.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 16:48:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-113221-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=H4gVxb9E; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-113221-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-113221-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 13F811F21871 for ; Sun, 24 Mar 2024 23:48:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7BC68181473; Sun, 24 Mar 2024 22:40:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="H4gVxb9E" 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 74E74180B9A; Sun, 24 Mar 2024 22:40:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320022; cv=none; b=umDYVg4Nn3qotlIUM1uzVSs0Of4KdLGXwDxWyGI8AUzi8NL4md732ArM930x2nApxivjrc6FI/QtMl2T8cyj6UGcvQM8v/DjTzDlaq4yOB/UbcQGpT23rEKnFwOT4b8/fsNZOM+49SLX5Qs29LyxoKIdpUp+9k4XRciEbGG6POg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711320022; c=relaxed/simple; bh=vP825Ku2Y5fpQtvsySFA7Z6w4KP+omheovnqVtB+F0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E+7abthOQwiN9pfh2v9hd5u5bvQSajTEcu99GS0Cpovu2Ugc4HRlZ7Mg3X+YFjBIWpT8v5arGEdg61ctI8QHMiifjhtTySvUt5AUbyvydcJuMqm5UT6cdusblvsS8S1TCtvnUJb7YcfSdK+fyoGASWIBCclIhfSDBcLKbkOtBOI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=H4gVxb9E; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B69BCC433A6; Sun, 24 Mar 2024 22:40:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711320022; bh=vP825Ku2Y5fpQtvsySFA7Z6w4KP+omheovnqVtB+F0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H4gVxb9EJQBbnIzVWnlknzNh62vVXNlHs1NTzHbUC/wtIcY9Si2ozdf7XrB9s7qYL sGfTg9Ajr13stJvqiVlnfgde0toZgYbkcE55zoAtGKICyJz2Wu4Z4edESScPRbRfI1 i0Wa7e3xubN25KykRJDGSlll4W2q/dJmfHY9oM6j6hZefTD5jXqHcMOVdvj+2CKkHr rqetDkZ2HLaGhrmFsNStbaHr0MSm2GaN1aHntcyaOOaTEmi8nYFh17rdz3bSbQlxF+ h1myY6Z/LyIy2pjAiQsWy146vJCtcvKR/oDC42CE0oV7juLdcmQXMMxW7+I9iFtXvo 3d7k6TpBvaaxw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jijie Shao , "David S . Miller" , Sasha Levin Subject: [PATCH 6.8 330/715] net: hns3: fix wrong judgment condition issue Date: Sun, 24 Mar 2024 18:28:29 -0400 Message-ID: <20240324223455.1342824-331-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324223455.1342824-1-sashal@kernel.org> References: <20240324223455.1342824-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Jijie Shao [ Upstream commit 07a1d6dc90baedcf5d713e2b003b9e387130ee30 ] In hns3_dcbnl_ieee_delapp, should check ieee_delapp not ieee_setapp. This path fix the wrong judgment. Fixes: 0ba22bcb222d ("net: hns3: add support config dscp map to tc") Signed-off-by: Jijie Shao Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c b/drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c index 3b6dbf158b98d..f72dc0cee30e5 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c @@ -76,7 +76,7 @@ static int hns3_dcbnl_ieee_delapp(struct net_device *ndev, struct dcb_app *app) if (hns3_nic_resetting(ndev)) return -EBUSY; - if (h->kinfo.dcb_ops->ieee_setapp) + if (h->kinfo.dcb_ops->ieee_delapp) return h->kinfo.dcb_ops->ieee_delapp(h, app); return -EOPNOTSUPP; -- 2.43.0