patch 'common/idpf: fix void function returning a value' has been queued to stable release 23.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b60a546487237f2b2c011d921db850c71ba6c5e0

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b60a546487237f2b2c011d921db850c71ba6c5e0 Mon Sep 17 00:00:00 2001
From: Andre Muezerie <andremue at linux.microsoft.com>
Date: Wed, 22 Jan 2025 07:20:43 -0800
Subject: [PATCH] common/idpf: fix void function returning a value
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ]

This patch avoids warnings like the one below emitted by MSVC:

../drivers/common/idpf/idpf_common_rxtx_avx512.c(139):
    warning C4098: 'idpf_singleq_rearm':
    'void' function returning a value

Fixes: 5bf87b45b2c8 ("net/idpf: add AVX512 data path for single queue model")
Fixes: e528d7c74819 ("common/idpf: add AVX512 data path for split queue model")

Signed-off-by: Andre Muezerie <andremue at linux.microsoft.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/common/idpf/idpf_common_rxtx_avx512.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c
index 5abafc729b..617ef092d1 100644
--- a/drivers/common/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c
@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)

 	rxdp += rxq->rxrearm_start;

-	if (unlikely(cache == NULL))
-		return idpf_singleq_rearm_common(rxq);
+	if (unlikely(cache == NULL)) {
+		idpf_singleq_rearm_common(rxq);
+		return;
+	}

 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)

 	rxdp += rx_bufq->rxrearm_start;

-	if (unlikely(!cache))
-		return idpf_splitq_rearm_common(rx_bufq);
+	if (unlikely(!cache)) {
+		idpf_splitq_rearm_common(rx_bufq);
+		return;
+	}

 	/* We need to pull 'n' more MBUFs into the software ring from mempool
 	 * We inline the mempool function here, so we can vectorize the copy
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-02-18 19:39:03.120612718 +0800
+++ 0069-common-idpf-fix-void-function-returning-a-value.patch	2025-02-18 19:39:00.688244037 +0800
@@ -1 +1 @@
-From c39e89b467c510923295a73e5b76a6a44c72dd1b Mon Sep 17 00:00:00 2001
+From b60a546487237f2b2c011d921db850c71ba6c5e0 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit c39e89b467c510923295a73e5b76a6a44c72dd1b ]
@@ -14 +16,0 @@
-Cc: stable at dpdk.org
@@ -23 +25 @@
-index 6fbfee1b2d..b630d1fcd9 100644
+index 5abafc729b..617ef092d1 100644
@@ -26 +28 @@
-@@ -133,8 +133,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
+@@ -137,8 +137,10 @@ idpf_singleq_rearm(struct idpf_rx_queue *rxq)
@@ -39 +41 @@
-@@ -603,8 +605,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)
+@@ -607,8 +609,10 @@ idpf_splitq_rearm(struct idpf_rx_queue *rx_bufq)