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 9527A54903; Tue, 14 May 2024 11:04:59 +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=1715684699; cv=none; b=kJMxOfoxYyj/JoTciU/+mtoA4bAIdj61tDltWLVXtU3+jp/5v1rrBf+s0h9vPFaHQx0PL1OgmEe+ZL89aE55/tomt7aJV0bNcoJAAwa82WPRFyYqoKM9lBceXXPcDLDj05hOenWN1IVWiVSyAzMCapU1JrDR/BfYjPFwPTiaQeQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715684699; c=relaxed/simple; bh=QPxKfoTMiNVwPH37o8gDLaXOmtnq0p8gBWCBZycebCA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Bg1LgPCt2ibSTY5MFJzhpmc9GVRDgTaGNk2Rsj0PMd09F3CgkKxKdNfkwk12JDxYS3+oeijQc7aQT6rY9TF8kX3r8BZDqgBVCJ23OYoDxaLd/lKPFDH6ak7Yn89T/pc8UY9XRK7WrFLPxBOPIFfxVNF4Naf26lPxrD0n5mvKiOA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=q+jMk5M6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="q+jMk5M6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E1D1C2BD10; Tue, 14 May 2024 11:04:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715684699; bh=QPxKfoTMiNVwPH37o8gDLaXOmtnq0p8gBWCBZycebCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q+jMk5M6CEkOSKfFUC1SqzV8v7/Le+vWArjkaNhtarpRBL3hZkOJHIdwpKjStWLgW 1TIamxuR637mbTvmFdmUW1+cy1YtxT5qAEVxTt2GZQ792wD9nTXDcFPCFWIhGVszB5 63HYVGziSf/vycOTlZPa/HwZubTUrbiql6jIyy2U= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Asbj=C3=B8rn=20Sloth=20T=C3=B8nnesen?= , Simon Horman , "David S. Miller" , Sasha Levin Subject: [PATCH 6.6 060/301] net: qede: use return from qede_parse_flow_attr() for flower Date: Tue, 14 May 2024 12:15:31 +0200 Message-ID: <20240514101034.509689541@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514101032.219857983@linuxfoundation.org> References: <20240514101032.219857983@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Asbjørn Sloth Tønnesen [ Upstream commit fcee2065a178f78be6fd516302830378b17dba3d ] In qede_add_tc_flower_fltr(), when calling qede_parse_flow_attr() then the return code was only used for a non-zero check, and then -EINVAL was returned. qede_parse_flow_attr() can currently fail with: * -EINVAL * -EOPNOTSUPP * -EPROTONOSUPPORT This patch changes the code to use the actual return code, not just return -EINVAL. The blaimed commit introduced these functions. Only compile tested. Fixes: 2ce9c93eaca6 ("qede: Ingress tc flower offload (drop action) support.") Signed-off-by: Asbjørn Sloth Tønnesen Reviewed-by: Simon Horman Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_filter.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qede/qede_filter.c b/drivers/net/ethernet/qlogic/qede/qede_filter.c index 8ecdfa36a6854..25ef0f4258cb1 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_filter.c +++ b/drivers/net/ethernet/qlogic/qede/qede_filter.c @@ -1879,10 +1879,9 @@ int qede_add_tc_flower_fltr(struct qede_dev *edev, __be16 proto, } /* parse flower attribute and prepare filter */ - if (qede_parse_flow_attr(edev, proto, f->rule, &t)) { - rc = -EINVAL; + rc = qede_parse_flow_attr(edev, proto, f->rule, &t); + if (rc) goto unlock; - } /* Validate profile mode and number of filters */ if ((edev->arfs->filter_count && edev->arfs->mode != t.mode) || -- 2.43.0