summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-03-23 09:18:59 +0100
committerChristian Breunig <christian@breunig.cc>2024-03-23 09:20:35 +0100
commit6ba7c507620e7616559727a5874c783f7a5fc627 (patch)
tree68c6a05e633f72f9d252e4b50a462d4d87c5608a
parent47b3ccb92dfc24aed0697eba7d5dd68675933d51 (diff)
downloadvyos-build-6ba7c507620e7616559727a5874c783f7a5fc627.tar.gz
vyos-build-6ba7c507620e7616559727a5874c783f7a5fc627.zip
ixgbe: T6155: always enable allow_unsupported_sfp even if module_param_array is undefined
This extends an else path with the logic from commit ea7d59a4b ("ixgbe: T6155: always enable allow_unsupported_sfp for all NICs by default") (cherry picked from commit 70ac747b2889757e35ac2a90fd77cda9d4b97ebd)
-rw-r--r--packages/linux-kernel/patches/ixgbe/allow_unsupported_sfp.patch24
1 files changed, 18 insertions, 6 deletions
diff --git a/packages/linux-kernel/patches/ixgbe/allow_unsupported_sfp.patch b/packages/linux-kernel/patches/ixgbe/allow_unsupported_sfp.patch
index 5e636320..647fe4d5 100644
--- a/packages/linux-kernel/patches/ixgbe/allow_unsupported_sfp.patch
+++ b/packages/linux-kernel/patches/ixgbe/allow_unsupported_sfp.patch
@@ -1,14 +1,14 @@
-From 7a95d34570377e46d5fdadb9b1c742db62e0256d Mon Sep 17 00:00:00 2001
+From 4f6c1dc3c48a1b2fa7c06206e6366bcfaa33f3f7 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
-Date: Fri, 22 Mar 2024 08:37:54 +0100
-Subject: [PATCH] param: always enable allow_unsupported_sfp
+Date: Fri, 22 Mar 2024 11:33:27 +0000
+Subject: [PATCH] ixgbe: always enable support for unsupported SFP+ modules
---
- ixgbe_param.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
+ ixgbe_param.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/ixgbe_param.c b/ixgbe_param.c
-index 71197b7..30c21bd 100644
+index 71197b7..dac33ca 100644
--- a/ixgbe_param.c
+++ b/ixgbe_param.c
@@ -307,7 +307,7 @@ IXGBE_PARAM(LRO, "Large Receive Offload (0,1), default 0 = off");
@@ -31,6 +31,18 @@ index 71197b7..30c21bd 100644
};
#ifdef module_param_array
if (num_allow_unsupported_sfp > bd) {
+@@ -1150,7 +1150,11 @@ void ixgbe_check_options(struct ixgbe_adapter *adapter)
+ }
+ #ifdef module_param_array
+ } else {
++ if (opt.def == OPTION_ENABLED) {
++ adapter->hw.allow_unsupported_sfp = true;
++ } else {
+ adapter->hw.allow_unsupported_sfp = false;
++ }
+ }
+ #endif
+ }
--
2.39.2