From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 93DF6A054A for ; Tue, 25 Oct 2022 17:09:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E3A242C42; Tue, 25 Oct 2022 17:09:59 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AEE8D42C3C for ; Tue, 25 Oct 2022 17:09:58 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666710598; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KCF+DQaNawiKnCeJPmZOJxg7pnTz6NwSEpLiNWUijro=; b=aW/hxD6S4HdVUtPMdVpd1PnbnaY16UXW1taDSCkJaiQJjmUCyK8ncJQ7Dh7Fm9TBFzlmbs X2LmH+YiEjWy5WldkbKTPY+Z1UE3ZwJJrbUBAZ2O6zm+sQNVnan+0WsTZhQA9PWVwoz8tD fqxQr7Z6U+gEjduxlX9yhWMewedERn0= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-39-w8gcu6YGMP64oIXNVDTjVg-1; Tue, 25 Oct 2022 11:09:56 -0400 X-MC-Unique: w8gcu6YGMP64oIXNVDTjVg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BA8323C138A2; Tue, 25 Oct 2022 15:09:55 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9B968492CA2; Tue, 25 Oct 2022 15:09:54 +0000 (UTC) From: Kevin Traynor To: David Marchand Cc: Ajit Khaparde , dpdk stable Subject: patch 'net/bnxt: fix build with GCC 13' has been queued to stable release 21.11.3 Date: Tue, 25 Oct 2022 16:07:20 +0100 Message-Id: <20221025150734.142189-85-ktraynor@redhat.com> In-Reply-To: <20221025150734.142189-1-ktraynor@redhat.com> References: <20221025150734.142189-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1b93855eb5a34513ed76e58a92e0443ec58962c6 Thanks. Kevin --- >From 1b93855eb5a34513ed76e58a92e0443ec58962c6 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 3 Oct 2022 18:57:44 +0200 Subject: [PATCH] net/bnxt: fix build with GCC 13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit bb7e1f17a6f3419725d11184e68749298205a8dc ] GCC 13 complains with: ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.c:962:1: error: conflicting types for ‘ulp_flow_db_flush_flows’ due to enum/integer mismatch; have ‘int32_t(struct bnxt_ulp_context *, enum bnxt_ulp_fdb_type)’ {aka ‘int(struct bnxt_ulp_context *, enum bnxt_ulp_fdb_type)’} [-Werror=enum-int-mismatch] 962 | ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.c:12: ../../../dpdk/drivers/net/bnxt/tf_ulp/ulp_flow_db.h:211:1: note: previous declaration of ‘ulp_flow_db_flush_flows’ with type ‘int32_t(struct bnxt_ulp_context *, uint32_t)’ {aka ‘int(struct bnxt_ulp_context *, unsigned int)’} 211 | ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, | ^~~~~~~~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors Fixes: 30683082a8ed ("net/bnxt: combine default and regular flows") Signed-off-by: David Marchand Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/tf_ulp/ulp_flow_db.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h index b27678dae9..2b02836a40 100644 --- a/drivers/net/bnxt/tf_ulp/ulp_flow_db.h +++ b/drivers/net/bnxt/tf_ulp/ulp_flow_db.h @@ -204,5 +204,5 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt, * * ulp_ctxt [in] Ptr to ulp context - * tbl_idx [in] The index to table + * flow_type [in] - specify default or regular * * returns 0 on success or negative number on failure @@ -210,5 +210,5 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt, int32_t ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx, - uint32_t idx); + enum bnxt_ulp_fdb_type flow_type); /* -- 2.37.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-10-25 14:19:00.469340901 +0100 +++ 0085-net-bnxt-fix-build-with-GCC-13.patch 2022-10-25 14:18:58.524798496 +0100 @@ -1 +1 @@ -From bb7e1f17a6f3419725d11184e68749298205a8dc Mon Sep 17 00:00:00 2001 +From 1b93855eb5a34513ed76e58a92e0443ec58962c6 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit bb7e1f17a6f3419725d11184e68749298205a8dc ] + @@ -29 +30,0 @@ -Cc: stable@dpdk.org