From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 67ABBA0351 for ; Thu, 6 Aug 2020 11:57:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5F7431C0C0; Thu, 6 Aug 2020 11:57:45 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 861231C0C0 for ; Thu, 6 Aug 2020 11:57:44 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id f12so7547472wru.13 for ; Thu, 06 Aug 2020 02:57:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dZz1+jfIQErZAg/ZV2Hc0QINVaKCeFI06tTYSivJ7o4=; b=tnk3Y+bulLtrClEKf9jfvKGLRsnrqLYop0UbeqKArGLTFnFKAXc7OYT5aIzxAkxzwL s5Au1CsZzs3uhpQCIim4SSqK6aSasNuFRcmoq4Sp6sRWxN+AYoCGnsRDhoAhAp28e2M4 g9WaHnKfSVBpxmEqf1GPhdFaLQFj10yE0/HGpdSpQMMkK/UfQAOVfMx6WHqqrmVgFAEI IwLug6PM/Xhuo98xT/uftVOyYMNRxW1WWdrXv3jNborFOGapFR4dGzpSGKIpj7uJNeub ZYFfVG8l+OTPuM/DxbL8qqsJH7aUnSfw1jCZ5U9ZiN79d1WJuBWN8lGllFXhOND4TUMj ecrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dZz1+jfIQErZAg/ZV2Hc0QINVaKCeFI06tTYSivJ7o4=; b=MLKRE8FUGWLynoGrzihZxLP5CbMqnei3/FxFeoZysPp7/L8cFHGcJNdg3awRQHM4qh 7fPPZbdKoPwvAeJ9W8Y03q5Q1/r3QKoqdWEc9Gj/UiGhYbVEw4SHqc0yfr2m02d54PlX W+tF53z3RShytRShZL8c4qAdI9r7xicFlx5oOkt61yNpTLQlHAMV8PiHG5QedMYF+zDe gIEpHINTZPbKnfX9ry5LrgCBpFSlHuvHD7q1kkOTYYBiIOWckVJn+EhitStVRbZtG+Ha cj48qGQN8PlW42FGJXopXzPZIC51Py2t8Cc/d5UCJDYX1hJ4YULC6MfP3cy54Vv26N4G XgtA== X-Gm-Message-State: AOAM533MSJg8CWDcB/iry2/vB0GWvDavRFneqtLoHpcx6bhDQOqxsuMZ YSxd8j+HTtZdkStDhtvwndw= X-Google-Smtp-Source: ABdhPJxkbFu4BPXfKUsocgo/MPYPlNxUC2sgPhChTxNO82P5BgdZMgDbSfzI0xtG+yuvGcw+VKSZHA== X-Received: by 2002:adf:cf10:: with SMTP id o16mr6180473wrj.380.1596707864284; Thu, 06 Aug 2020 02:57:44 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id l7sm7503261wrf.32.2020.08.06.02.57.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:57:43 -0700 (PDT) From: luca.boccassi@gmail.com To: Parav Pandit Cc: Matan Azrad , dpdk stable Date: Thu, 6 Aug 2020 10:53:31 +0100 Message-Id: <20200806095411.774624-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix void parameters in glue wrappers' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/08/20. 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. Thanks. Luca Boccassi --- >From 5a68d9a798279cbe9a763deedb9ac575ca967ac1 Mon Sep 17 00:00:00 2001 From: Parav Pandit Date: Mon, 27 Jul 2020 20:47:09 +0300 Subject: [PATCH] common/mlx5: fix void parameters in glue wrappers [ upstream commit 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 ] Following two errors are reported when compiled with gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5). drivers/common/mlx5/linux/mlx5_glue.h:188:2: error: function declaration isn't a prototype [-Werror=strict-prototypes] drivers/common/mlx5/linux/mlx5_glue.h:188:2: error: function declaration isn't a prototype [-Werror=strict-prototypes] Fix them by adding void data type in empty argument list. Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch") Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue") Signed-off-by: Parav Pandit Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_glue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h index 4e6465523..9895e5597 100644 --- a/drivers/net/mlx5/mlx5_glue.h +++ b/drivers/net/mlx5/mlx5_glue.h @@ -167,11 +167,11 @@ struct mlx5_glue { void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl); void *(*dr_create_flow_action_dest_port)(void *domain, uint32_t port); - void *(*dr_create_flow_action_drop)(); + void *(*dr_create_flow_action_drop)(void); void *(*dr_create_flow_action_push_vlan) (struct mlx5dv_dr_domain *domain, rte_be32_t vlan_tag); - void *(*dr_create_flow_action_pop_vlan)(); + void *(*dr_create_flow_action_pop_vlan)(void); void *(*dr_create_flow_tbl)(void *domain, uint32_t level); int (*dr_destroy_flow_tbl)(void *tbl); void *(*dr_create_domain)(struct ibv_context *ctx, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-06 10:53:15.931989125 +0100 +++ 0003-common-mlx5-fix-void-parameters-in-glue-wrappers.patch 2020-08-06 10:53:15.700595422 +0100 @@ -1,8 +1,10 @@ -From 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 Mon Sep 17 00:00:00 2001 +From 5a68d9a798279cbe9a763deedb9ac575ca967ac1 Mon Sep 17 00:00:00 2001 From: Parav Pandit Date: Mon, 27 Jul 2020 20:47:09 +0300 Subject: [PATCH] common/mlx5: fix void parameters in glue wrappers +[ upstream commit 4c093ffa5b9bdebad9ef14ef4136624a7f44b0f6 ] + Following two errors are reported when compiled with gcc (GCC) 8.3.1 20191121 (Red Hat 8.3.1-5). @@ -16,19 +18,18 @@ Fixes: 34fa7c0268e7 ("net/mlx5: add drop action to Direct Verbs E-Switch") Fixes: 400d985eb586 ("net/mlx5: add VLAN push/pop DR commands to glue") -Cc: stable@dpdk.org Signed-off-by: Parav Pandit Acked-by: Matan Azrad --- - drivers/common/mlx5/linux/mlx5_glue.h | 4 ++-- + drivers/net/mlx5/mlx5_glue.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h -index c4f9b006a..734ace2a3 100644 ---- a/drivers/common/mlx5/linux/mlx5_glue.h -+++ b/drivers/common/mlx5/linux/mlx5_glue.h -@@ -185,11 +185,11 @@ struct mlx5_glue { +diff --git a/drivers/net/mlx5/mlx5_glue.h b/drivers/net/mlx5/mlx5_glue.h +index 4e6465523..9895e5597 100644 +--- a/drivers/net/mlx5/mlx5_glue.h ++++ b/drivers/net/mlx5/mlx5_glue.h +@@ -167,11 +167,11 @@ struct mlx5_glue { void *(*dr_create_flow_action_dest_flow_tbl)(void *tbl); void *(*dr_create_flow_action_dest_port)(void *domain, uint32_t port);