diff options
| author | Christian Breunig <christian@breunig.cc> | 2026-05-12 06:07:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-05-12 06:07:48 +0200 |
| commit | d98030b937e45adc600a542edcf892ef2fa86ab3 (patch) | |
| tree | 1a52ca32486189f279e3e063673425685d62476f /scripts/package-build/linux-kernel/config | |
| parent | b0810fb7930534e97dbd7a69417ec24ceed78163 (diff) | |
| parent | f3a221bf83c58f43059386f00237e0f00818de25 (diff) | |
| download | vyos-build-d98030b937e45adc600a542edcf892ef2fa86ab3.tar.gz vyos-build-d98030b937e45adc600a542edcf892ef2fa86ab3.zip | |
Merge pull request #1185 from c-po/intel-oot
Kernel: T6847: update Intel Out-Of-Tree drivers for IGB, IXGBE, I40e, ICE and IAVF
Diffstat (limited to 'scripts/package-build/linux-kernel/config')
4 files changed, 8 insertions, 19 deletions
diff --git a/scripts/package-build/linux-kernel/config/51-bridge.config b/scripts/package-build/linux-kernel/config/51-bridge.config index 4204ae70..7217df41 100644 --- a/scripts/package-build/linux-kernel/config/51-bridge.config +++ b/scripts/package-build/linux-kernel/config/51-bridge.config @@ -3,8 +3,7 @@ # # Software 802.1D / 802.1Q bridge driver used by VyOS # "interfaces bridge". STP (Spanning Tree Protocol) and LLC -# are auto-selected by net/bridge/Kconfig when CONFIG_BRIDGE -# is enabled, so they don't need to be listed here explicitly. +# are auto-selected by net/bridge/Kconfig # ebtables / bridge-netfilter rules live in 20-netfilter.config. # diff --git a/scripts/package-build/linux-kernel/config/57-openvpn.config b/scripts/package-build/linux-kernel/config/57-openvpn.config index 2de2e7e4..c139b047 100644 --- a/scripts/package-build/linux-kernel/config/57-openvpn.config +++ b/scripts/package-build/linux-kernel/config/57-openvpn.config @@ -3,7 +3,7 @@ # # In-kernel OpenVPN dataplane used by VyOS # "interfaces openvpn" when the kernel offload is available. -# The userspace daemon uses /dev/net/tun (CONFIG_TUN) which +# The userspace daemon uses /dev/net/tun which # stays in the per-arch defconfig. # diff --git a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig index 3afde45c..a4b03f3b 100644 --- a/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig +++ b/scripts/package-build/linux-kernel/config/arm64/vyos_defconfig @@ -1832,12 +1832,9 @@ CONFIG_IGB_HWMON=y CONFIG_IGBVF=m # CONFIG_IXGBE is not set # CONFIG_IXGBEVF is not set -CONFIG_I40E=m -# CONFIG_I40E_DCB is not set -CONFIG_IAVF=m -CONFIG_I40EVF=m -CONFIG_ICE=m -CONFIG_ICE_SWITCHDEV=y +# CONFIG_I40E is not set +# CONFIG_I40EVF is not set +# CONFIG_ICE is not set # CONFIG_FM10K is not set CONFIG_IGC=m CONFIG_JME=m @@ -5674,7 +5671,6 @@ CONFIG_OBJAGG=m CONFIG_GENERIC_IOREMAP=y CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y -CONFIG_PLDMFW=y CONFIG_DEBUG_MISC=y diff --git a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig index 7631bf28..22eb3271 100644 --- a/scripts/package-build/linux-kernel/config/x86/vyos_defconfig +++ b/scripts/package-build/linux-kernel/config/x86/vyos_defconfig @@ -1717,13 +1717,9 @@ CONFIG_IGB_DCA=y CONFIG_IGBVF=m # CONFIG_IXGBE is not set # CONFIG_IXGBEVF is not set -CONFIG_I40E=m -# CONFIG_I40E_DCB is not set -CONFIG_IAVF=m -CONFIG_I40EVF=m -CONFIG_ICE=m -CONFIG_ICE_SWITCHDEV=y -CONFIG_ICE_HWTS=y +# CONFIG_I40E is not set +# CONFIG_I40EVF is not set +# CONFIG_ICE is not set # CONFIG_FM10K is not set CONFIG_IGC=m CONFIG_JME=m @@ -4631,8 +4627,6 @@ CONFIG_PARMAN=m CONFIG_OBJAGG=m # end of Library routines -CONFIG_PLDMFW=y - # CONFIG_DEBUG_MISC is not set # |