patch 'net/nfp: remove unused message length' has been queued to stable release 20.11.4

Xueming Li xuemingl at nvidia.com
Sun Nov 28 15:53:28 CET 2021


Hi,

FYI, your patch has been queued to stable release 20.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 11/30/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/e72e4962d5e73e03a590f7622391129b24dd1bfe

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From e72e4962d5e73e03a590f7622391129b24dd1bfe Mon Sep 17 00:00:00 2001
From: Conor Walsh <conor.walsh at intel.com>
Date: Mon, 15 Nov 2021 17:58:54 +0000
Subject: [PATCH] net/nfp: remove unused message length
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 9465a5d5a065b66075614e3712f9459c3e267155 ]

Reported by clang 13.

Bugzilla ID: 881
Fixes: 29a62d1476b6 ("net/nfp: add CPP bridge as service")

Reported-by: Liang Longfeng <longfengx.liang at intel.com>
Signed-off-by: Conor Walsh <conor.walsh at intel.com>
Reviewed-by: David Marchand <david.marchand at redhat.com>
---
 drivers/net/nfp/nfp_net.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 39a6d3f570..8e27845ce6 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -3044,7 +3044,7 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
 	off_t offset, nfp_offset;
 	uint32_t cpp_id, pos, len;
 	uint32_t tmpbuf[16];
-	size_t count, curlen, totlen = 0;
+	size_t count, curlen;
 	int err = 0;
 
 	PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu\n", __func__,
@@ -3121,7 +3121,6 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
 		}
 
 		nfp_offset += pos;
-		totlen += pos;
 		nfp_cpp_area_release(area);
 		nfp_cpp_area_free(area);
 
@@ -3146,7 +3145,7 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)
 	off_t offset, nfp_offset;
 	uint32_t cpp_id, pos, len;
 	uint32_t tmpbuf[16];
-	size_t count, curlen, totlen = 0;
+	size_t count, curlen;
 	int err = 0;
 
 	PMD_CPP_LOG(DEBUG, "%s: offset size %zu, count_size: %zu\n", __func__,
@@ -3222,7 +3221,6 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)
 		}
 
 		nfp_offset += pos;
-		totlen += pos;
 		nfp_cpp_area_release(area);
 		nfp_cpp_area_free(area);
 
-- 
2.34.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-28 22:41:04.693003483 +0800
+++ 0024-net-nfp-remove-unused-message-length.patch	2021-11-28 22:41:03.236875822 +0800
@@ -1 +1 @@
-From 9465a5d5a065b66075614e3712f9459c3e267155 Mon Sep 17 00:00:00 2001
+From e72e4962d5e73e03a590f7622391129b24dd1bfe Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 9465a5d5a065b66075614e3712f9459c3e267155 ]
@@ -10 +12,0 @@
-Cc: stable at dpdk.org
@@ -16 +18 @@
- drivers/net/nfp/nfp_cpp_bridge.c | 6 ++----
+ drivers/net/nfp/nfp_net.c | 6 ++----
@@ -19,5 +21,5 @@
-diff --git a/drivers/net/nfp/nfp_cpp_bridge.c b/drivers/net/nfp/nfp_cpp_bridge.c
-index 74a0eacb3f..0922ea9cf9 100644
---- a/drivers/net/nfp/nfp_cpp_bridge.c
-+++ b/drivers/net/nfp/nfp_cpp_bridge.c
-@@ -58,7 +58,7 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
+diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
+index 39a6d3f570..8e27845ce6 100644
+--- a/drivers/net/nfp/nfp_net.c
++++ b/drivers/net/nfp/nfp_net.c
+@@ -3044,7 +3044,7 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
@@ -32 +34 @@
-@@ -135,7 +135,6 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
+@@ -3121,7 +3121,6 @@ nfp_cpp_bridge_serve_write(int sockfd, struct nfp_cpp *cpp)
@@ -40 +42 @@
-@@ -160,7 +159,7 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)
+@@ -3146,7 +3145,7 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)
@@ -49 +51 @@
-@@ -236,7 +235,6 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)
+@@ -3222,7 +3221,6 @@ nfp_cpp_bridge_serve_read(int sockfd, struct nfp_cpp *cpp)


More information about the stable mailing list