summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2023-09-19 10:58:24 +0000
committerChristian Breunig <christian@breunig.cc>2023-09-19 21:23:45 +0200
commit189d3a6ef179e720b5558c2deac3e5ab263feaba (patch)
tree2bb59537df654a0290bf048696c7d4558cbd3ea5
parent5a6aa5bb9ad9e54caebe42374ff73968a980220b (diff)
downloadvyos-build-189d3a6ef179e720b5558c2deac3e5ab263feaba.tar.gz
vyos-build-189d3a6ef179e720b5558c2deac3e5ab263feaba.zip
T5588: Add kernel module CONFIG_NF_CONNTRACK_BRIDGE
(cherry picked from commit 97ddcaec1f488bef18c0d8dfa37cb272115e548a)
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index ab53a174..8537751b 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -1322,7 +1322,7 @@ CONFIG_NF_TABLES_BRIDGE=m
# CONFIG_NFT_BRIDGE_META is not set
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index a779c30c..41454024 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -1475,7 +1475,7 @@ CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_TABLES_BRIDGE=m
# CONFIG_NFT_BRIDGE_META is not set
CONFIG_NFT_BRIDGE_REJECT=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m