[PATCH] net/bnxt: fix build with GCC 13

[PATCH] net/bnxt: fix build with GCC 13

[David Marchand]

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")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 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
@@ -203,13 +203,13 @@ ulp_flow_db_resource_get(struct bnxt_ulp_context *ulp_ctxt,
  * Flush all flows in the flow database.
  *
  * 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
  */
 int32_t
 ulp_flow_db_flush_flows(struct bnxt_ulp_context *ulp_ctx,
-			uint32_t idx);
+			enum bnxt_ulp_fdb_type flow_type);
 
 /*
  * Flush all flows in the flow database that belong to a device function.
-- 
2.37.3

Re: [PATCH] net/bnxt: fix build with GCC 13

[Ajit Khaparde]

[-- Attachment #1: Type: text/plain, Size: 1330 bytes --]

On Mon, Oct 3, 2022 at 9:58 AM David Marchand <david.marchand@redhat.com> wrote:
>
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
Reviewed-by: Ajit Khaparde <ajit.khaparde@broadcom.com>

Patch applied to dpdk-next-net-brcm.

Thanks
Ajit

[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4218 bytes --]