patch 'net/e1000/base: fix fallthrough in switch' has been queued to stable release 23.11.3

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/24. 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://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=9a80a0abaf4df9facbefdded1635cbccdab353ac

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 9a80a0abaf4df9facbefdded1635cbccdab353ac Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen at networkplumber.org>
Date: Thu, 14 Nov 2024 09:11:55 -0800
Subject: [PATCH] net/e1000/base: fix fallthrough in switch
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f ]

There is an incorrect fallthrough identified by PVS studio.
Even though this is in base code it should be fixed, and
the warning should be re-enabled to prevent future bugs.

Link: https://pvs-studio.com/en/blog/posts/cpp/1183/
Fixes: f2553cb9eba6 ("net/e1000/base: add new I219 devices")

Signed-off-by: Stephen Hemminger <stephen at networkplumber.org>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/e1000/base/e1000_82575.c | 1 +
 drivers/net/e1000/base/e1000_api.c   | 1 +
 drivers/net/e1000/base/meson.build   | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/net/e1000/base/e1000_82575.c b/drivers/net/e1000/base/e1000_82575.c
index 7c78649393..53900cf8f1 100644
--- a/drivers/net/e1000/base/e1000_82575.c
+++ b/drivers/net/e1000/base/e1000_82575.c
@@ -1722,6 +1722,7 @@ STATIC s32 e1000_get_media_type_82575(struct e1000_hw *hw)
 			break;
 		}
 		/* Fall through for I2C based SGMII */
+		/* Fall through */
 	case E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES:
 		/* read media type from SFP EEPROM */
 		ret_val = e1000_set_sfp_media_type_82575(hw);
diff --git a/drivers/net/e1000/base/e1000_api.c b/drivers/net/e1000/base/e1000_api.c
index 0f6e5afa3b..6697b4b64f 100644
--- a/drivers/net/e1000/base/e1000_api.c
+++ b/drivers/net/e1000/base/e1000_api.c
@@ -295,6 +295,7 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
 	case E1000_DEV_ID_PCH_RPL_I219_LM23:
 	case E1000_DEV_ID_PCH_RPL_I219_V23:
 		mac->type = e1000_pch_tgp;
+		break;
 	case E1000_DEV_ID_PCH_ADL_I219_LM17:
 	case E1000_DEV_ID_PCH_ADL_I219_V17:
 	case E1000_DEV_ID_PCH_RPL_I219_LM22:
diff --git a/drivers/net/e1000/base/meson.build b/drivers/net/e1000/base/meson.build
index 528a33f958..5a7a87f8a7 100644
--- a/drivers/net/e1000/base/meson.build
+++ b/drivers/net/e1000/base/meson.build
@@ -23,8 +23,7 @@ sources = [
 ]

 error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
-    '-Wno-unused-variable', '-Wno-misleading-indentation',
-    '-Wno-implicit-fallthrough']
+    '-Wno-unused-variable', '-Wno-misleading-indentation']
 c_args = cflags
 foreach flag: error_cflags
     if cc.has_argument(flag)
--
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-12-06 23:26:46.770313904 +0800
+++ 0080-net-e1000-base-fix-fallthrough-in-switch.patch	2024-12-06 23:26:44.083044826 +0800
@@ -1 +1 @@
-From 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f Mon Sep 17 00:00:00 2001
+From 9a80a0abaf4df9facbefdded1635cbccdab353ac Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 11a5adba21237d5905bcb3f5f695aa5a5cfecd9f ]
@@ -12 +14,0 @@
-Cc: stable at dpdk.org
@@ -19,2 +21,2 @@
- drivers/net/e1000/base/meson.build   | 1 -
- 3 files changed, 2 insertions(+), 1 deletion(-)
+ drivers/net/e1000/base/meson.build   | 3 +--
+ 3 files changed, 3 insertions(+), 2 deletions(-)
@@ -47 +49 @@
-index 6d6048488f..e73f3d6d55 100644
+index 528a33f958..5a7a87f8a7 100644
@@ -50,5 +52 @@
-@@ -24,7 +24,6 @@ sources = [
-
- error_cflags = [
-         '-Wno-unused-parameter',
--        '-Wno-implicit-fallthrough',
+@@ -23,8 +23,7 @@ sources = [
@@ -55,0 +54,5 @@
+
+ error_cflags = ['-Wno-uninitialized', '-Wno-unused-parameter',
+-    '-Wno-unused-variable', '-Wno-misleading-indentation',
+-    '-Wno-implicit-fallthrough']
++    '-Wno-unused-variable', '-Wno-misleading-indentation']
@@ -57,0 +61 @@
+     if cc.has_argument(flag)