Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:18:31 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2018-07-19 12:22:09 +0200
commitd9b5d887ce8371a239dc89330be353d89b7b9287 (patch)
tree181eb66135a1727c30fdbabcaff1e6f3ac22bea6
parent3cb6584af611c43d4ecad4d5affce8fd368e7cdb (diff)
fm10k: warn if the stat size is unknown (bsc#1101813
-rw-r--r--patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch26
-rw-r--r--series.conf1
2 files changed, 27 insertions, 0 deletions
diff --git a/patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch b/patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch
new file mode 100644
index 0000000000..3d094066ec
--- /dev/null
+++ b/patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch
@@ -0,0 +1,26 @@
+From: Jacob Keller <jacob.e.keller@intel.com>
+Date: Thu, 12 Apr 2018 11:15:58 -0700
+Subject: fm10k: warn if the stat size is unknown
+Patch-mainline: v4.18-rc1
+Git-commit: 454ca380ce3cac79bfd295f5a7ae15ec26ff1b67
+References: bsc#1101813 FATE#325148
+
+Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
+Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
++++ b/drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c
+@@ -265,6 +265,8 @@ static void __fm10k_add_ethtool_stats(u6
+ *((*data)++) = *(u8 *)p;
+ break;
+ default:
++ WARN_ONCE(1, "unexpected stat size for %s",
++ stats[i].stat_string);
+ *((*data)++) = 0;
+ }
+ }
diff --git a/series.conf b/series.conf
index 281c658c50..cbae5f4cb4 100644
--- a/series.conf
+++ b/series.conf
@@ -13927,6 +13927,7 @@
patches.drivers/fm10k-reduce-duplicate-fm10k_stat-macro-code.patch
patches.drivers/fm10k-use-variadic-arguments-to-fm10k_add_stat_strin.patch
patches.drivers/fm10k-use-macro-to-avoid-passing-the-array-and-size-.patch
+ patches.drivers/fm10k-warn-if-the-stat-size-is-unknown.patch
patches.drivers/qed-Fix-possibility-of-list-corruption-during-rmmod-.patch
patches.drivers/qed-Fix-LL2-race-during-connection-terminate.patch
patches.drivers/mwifiex-pcie-tighten-a-check-in-mwifiex_pcie_process