Received: by 2002:ab2:6857:0:b0:1ef:ffd0:ce49 with SMTP id l23csp2488972lqp; Sun, 24 Mar 2024 23:13:56 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWp7Efebc+v8rIokhBJHQAkMixF50KfrgWe7mLfF4dIL0O1o+9ClDR49aevI6Hy5JI5vou/JFw0HHdBNI3qjrl2yAUJjwx9qs0YbOYgyA== X-Google-Smtp-Source: AGHT+IHkqhzooiiHrSE5tgcEDJv/M6PKsA4e5ERzDza5y7msj1ROxcZhkFk3+f8imy8Q74twU3VK X-Received: by 2002:a17:902:d2cc:b0:1e0:cd89:752d with SMTP id n12-20020a170902d2cc00b001e0cd89752dmr284963plc.39.1711347235822; Sun, 24 Mar 2024 23:13:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1711347235; cv=pass; d=google.com; s=arc-20160816; b=lt/FgQGDpVQ8dcW94ZitEYdfbkG4W0ZNn6G2V6xA/w7MepinclaZzsdoLU35QTZ5Pp BaPD1qyCH7A9rv+KfZ6I4EDZnMi67UgBzkleSYp3l9yV5jdMdOakLXAkfvPSVuCXG/46 lym8RE8EqA2+EGnLZM3Y57UxfGzQFs7o70pKSQCA8TcJHGqxdkMh/It9DR/TRLgWGPWd xR2ZteNPyRX9TACxtcDjHhTZiZaK5Tloac8U8mYtkM78QgVgl8UW6I9z3BmWRYCsQiKy XSSNotoSgWO67T7V3BfZikNQxk8hdHK9v6TdEsi0PUjYr5mZKoXkpCARG1Zvyextvsj0 FEmA== 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=pkxKFNsuBNxFVKSUPQFXLyhLKWBYT+I7n4kbzHli/mtsf3371pnn0b244VJdvw8JOz nrKnLjuVigDKxHmobwgefHjut64AmDBYvfPW9e6espVsqaiq7z19YRsrFqtl2FYHtRvu pSKZ5nX/pPa2IIqML6PyrR9y+hyxwSQk4J1VdJsQC9/cvQSXOYSuSHL/MljxYw0BTg4F FVzZRzhHzDgK3W1SsdV+iKq+BW0Xd/DIxShnMXGWPIaBRsovLvCa0LeOX4dHNrBgoOtV ds4LuqiNGeMiXjbCWzHeRPQ2VGn9aqlIkDF78lwnmR+MD8cZfhR3KtN7WBbgPm79w4hx swSA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=atAkYU6m; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114511-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114511-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id i15-20020a170902c94f00b001e02c963546si4740841pla.65.2024.03.24.23.13.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Mar 2024 23:13:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-114511-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=atAkYU6m; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-114511-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-114511-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 7C03F29159E for ; Mon, 25 Mar 2024 06:13:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 72A2F5D467; Sun, 24 Mar 2024 23:48:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="atAkYU6m" 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 3C854229D67; Sun, 24 Mar 2024 23:15:39 +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=1711322141; cv=none; b=ARzosdFFB2OZ7Drfb3FxvS6ULlgu1HGFq1GIozfCGHX1Y2jRM96cehFayobiqFWbAqZ8lGpCgDx4aLaw2MYq6GdkILB2Xps3k4gwcQ+KcEHwtLcaqNs2pZ6+8GcWObv7UD27FY7DfBCaCA88LSf+sf9WVcxnL+yjjbIBLIbPrk4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322141; c=relaxed/simple; bh=vP825Ku2Y5fpQtvsySFA7Z6w4KP+omheovnqVtB+F0Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CWQturihNrEpErU0rd1rGD3ymqfmqYh995VLolViqdNNRAxI/+smOyxJ3WWnbluCd4FwFutRV0Gd8XFd+CSoZ5C1okoFU8CioN8qcts/uiHbVwEOeFCq0NroQrx7Ey2nP67d6nbUcimxI0ay6+BbxJtY7GknzWKUi/hIHCoaG/Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=atAkYU6m; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 284B9C433F1; Sun, 24 Mar 2024 23:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322139; bh=vP825Ku2Y5fpQtvsySFA7Z6w4KP+omheovnqVtB+F0Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=atAkYU6mJ07Ql7Ec053X/2OqNgPLB10nAv6OuRu6PWUp61ZarEX1pFp/NxjWDqJ0p Oa360ipJtKldcgKosj+zyDVcQmjE/ML0vHhgeeBmrfSjjiTtC5cHp+S9XGOWmESoP0 a9VFQS5/1ZQudQIdh26APMI74hSi64TDEsjEG3dIYMXWazBPO/QtOtsyWTfyeRppWs Xa9PHF+aOvmhTF5g4r7WG87EsgWyneepiyXYL7gB+ivdMgFvr6WB6PK2mFF4SnojxG rEHm5VZ8vKUG4dfnGe7TdCUpIJoKgGMniRD0yK6eKDhS2Q4MAlFNivO2gOPRKYWerY M6WN19zEOjnUA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jijie Shao , "David S . Miller" , Sasha Levin Subject: [PATCH 6.1 216/451] net: hns3: fix wrong judgment condition issue Date: Sun, 24 Mar 2024 19:08:12 -0400 Message-ID: <20240324231207.1351418-217-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-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