From e5dbe34d9a3b8a5615043c9417c310cb742fd333 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 24 Feb 2025 12:09:13 +0100 Subject: [PATCH] coreos-modules: Move CONFIG_SWITCHDEV to commonconfig Requires for mlx5 hardware offload on arm64 too. Signed-off-by: Jeremi Piotrowski --- .../sys-kernel/coreos-modules/files/amd64_defconfig-6.6 | 1 - .../sys-kernel/coreos-modules/files/commonconfig-6.6 | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 index 7ed67fe1d1..dde3394c87 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/amd64_defconfig-6.6 @@ -86,7 +86,6 @@ CONFIG_MMC_SDHCI_ACPI=m # CONFIG_MOUSE_PS2_LIFEBOOK is not set CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1 CONFIG_NET_DROP_MONITOR=m -CONFIG_NET_SWITCHDEV=y CONFIG_NVRAM=m CONFIG_OPTPROBES=y CONFIG_PARAVIRT_SPINLOCKS=y diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 index 4b065d16b6..88cfceca43 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/coreos-modules/files/commonconfig-6.6 @@ -659,6 +659,7 @@ CONFIG_NET_SCH_SFB=m CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_TEQL=m +CONFIG_NET_SWITCHDEV=y CONFIG_NET_TC_SKB_EXT=y CONFIG_NET_TULIP=y # CONFIG_NET_VENDOR_3COM is not set