patch 'net/e1000: fix xstats name' has been queued to stable release 22.11.9

[luca.boccassi@gmail.com]

Hi,

FYI, your patch has been queued to stable release 22.11.9

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 06/14/25. 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/bluca/dpdk-stable

This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/1a540ead0c9131b2412369634bb4c9b5b2203ee5

Thanks.

Luca Boccassi

---
From 1a540ead0c9131b2412369634bb4c9b5b2203ee5 Mon Sep 17 00:00:00 2001
From: Kaiwen Deng <kaiwenx.deng@intel.com>
Date: Thu, 10 Apr 2025 13:52:46 +0800
Subject: [PATCH] net/e1000: fix xstats name

[ upstream commit 9303834c26ec7b3fb91f84d2c953ce4dae3073fb ]

The igb and igc xstats names need to be corrected:
tx_size_1023_to_max_packets should be tx_size_1024_to_max_packets.

Fixes: 38552317dcef ("igb: add extended stats")
Fixes: e6defdfddc3b ("net/igc: enable statistics")

Signed-off-by: Kaiwen Deng <kaiwenx.deng@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
 drivers/net/e1000/igb_ethdev.c | 2 +-
 drivers/net/igc/igc_ethdev.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index 79d001e69a..b5df7473cd 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -479,7 +479,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = {
 	{"tx_size_256_to_511_packets", offsetof(struct e1000_hw_stats, ptc511)},
 	{"tx_size_512_to_1023_packets", offsetof(struct e1000_hw_stats,
 		ptc1023)},
-	{"tx_size_1023_to_max_packets", offsetof(struct e1000_hw_stats,
+	{"tx_size_1024_to_max_packets", offsetof(struct e1000_hw_stats,
 		ptc1522)},
 	{"tx_multicast_packets", offsetof(struct e1000_hw_stats, mptc)},
 	{"tx_broadcast_packets", offsetof(struct e1000_hw_stats, bptc)},
diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
index ce1f425eaf..9c00f8a5f6 100644
--- a/drivers/net/igc/igc_ethdev.c
+++ b/drivers/net/igc/igc_ethdev.c
@@ -163,7 +163,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = {
 	{"tx_size_256_to_511_packets", offsetof(struct igc_hw_stats, ptc511)},
 	{"tx_size_512_to_1023_packets", offsetof(struct igc_hw_stats,
 		ptc1023)},
-	{"tx_size_1023_to_max_packets", offsetof(struct igc_hw_stats,
+	{"tx_size_1024_to_max_packets", offsetof(struct igc_hw_stats,
 		ptc1522)},
 	{"tx_multicast_packets", offsetof(struct igc_hw_stats, mptc)},
 	{"tx_broadcast_packets", offsetof(struct igc_hw_stats, bptc)},
-- 
2.47.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2025-06-12 22:06:24.269753345 +0100
+++ 0010-net-e1000-fix-xstats-name.patch	2025-06-12 22:06:23.798043117 +0100
@@ -1 +1 @@
-From 9303834c26ec7b3fb91f84d2c953ce4dae3073fb Mon Sep 17 00:00:00 2001
+From 1a540ead0c9131b2412369634bb4c9b5b2203ee5 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9303834c26ec7b3fb91f84d2c953ce4dae3073fb ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -16,2 +17,2 @@
- drivers/net/intel/e1000/igb_ethdev.c | 2 +-
- drivers/net/intel/e1000/igc_ethdev.c | 2 +-
+ drivers/net/e1000/igb_ethdev.c | 2 +-
+ drivers/net/igc/igc_ethdev.c   | 2 +-
@@ -20,5 +21,5 @@
-diff --git a/drivers/net/intel/e1000/igb_ethdev.c b/drivers/net/intel/e1000/igb_ethdev.c
-index cbd2f15f5f..40f453c8d9 100644
---- a/drivers/net/intel/e1000/igb_ethdev.c
-+++ b/drivers/net/intel/e1000/igb_ethdev.c
-@@ -486,7 +486,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = {
+diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
+index 79d001e69a..b5df7473cd 100644
+--- a/drivers/net/e1000/igb_ethdev.c
++++ b/drivers/net/e1000/igb_ethdev.c
+@@ -479,7 +479,7 @@ static const struct rte_igb_xstats_name_off rte_igb_stats_strings[] = {
@@ -33,7 +34,7 @@
-diff --git a/drivers/net/intel/e1000/igc_ethdev.c b/drivers/net/intel/e1000/igc_ethdev.c
-index e712cfcf7c..68444e4fba 100644
---- a/drivers/net/intel/e1000/igc_ethdev.c
-+++ b/drivers/net/intel/e1000/igc_ethdev.c
-@@ -181,7 +181,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = {
- 	{"tx_size_256_to_511_packets", offsetof(struct e1000_hw_stats, ptc511)},
- 	{"tx_size_512_to_1023_packets", offsetof(struct e1000_hw_stats,
+diff --git a/drivers/net/igc/igc_ethdev.c b/drivers/net/igc/igc_ethdev.c
+index ce1f425eaf..9c00f8a5f6 100644
+--- a/drivers/net/igc/igc_ethdev.c
++++ b/drivers/net/igc/igc_ethdev.c
+@@ -163,7 +163,7 @@ static const struct rte_igc_xstats_name_off rte_igc_stats_strings[] = {
+ 	{"tx_size_256_to_511_packets", offsetof(struct igc_hw_stats, ptc511)},
+ 	{"tx_size_512_to_1023_packets", offsetof(struct igc_hw_stats,
@@ -41,2 +42,2 @@
--	{"tx_size_1023_to_max_packets", offsetof(struct e1000_hw_stats,
-+	{"tx_size_1024_to_max_packets", offsetof(struct e1000_hw_stats,
+-	{"tx_size_1023_to_max_packets", offsetof(struct igc_hw_stats,
++	{"tx_size_1024_to_max_packets", offsetof(struct igc_hw_stats,
@@ -44,2 +45,2 @@
- 	{"tx_multicast_packets", offsetof(struct e1000_hw_stats, mptc)},
- 	{"tx_broadcast_packets", offsetof(struct e1000_hw_stats, bptc)},
+ 	{"tx_multicast_packets", offsetof(struct igc_hw_stats, mptc)},
+ 	{"tx_broadcast_packets", offsetof(struct igc_hw_stats, bptc)},