summaryrefslogtreecommitdiff
path: root/packages/linux-kernel
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2023-09-19 20:58:54 +0200
committerGitHub <noreply@github.com>2023-09-19 20:58:54 +0200
commit27a6527011ac64574da881b15314607cad4ce075 (patch)
tree96ccfa6c27910925897fbf42a557df90a2d56bab /packages/linux-kernel
parent24c918b64657d972d06c30c316c8436bfc339461 (diff)
parent72f55aaac883d331a62e1506a3d35a80bf65933a (diff)
downloadvyos-build-27a6527011ac64574da881b15314607cad4ce075.tar.gz
vyos-build-27a6527011ac64574da881b15314607cad4ce075.zip
Merge pull request #416 from sever-sever/T5588
T5588: Add kernel module CONFIG_NF_CONNTRACK_BRIDGE
Diffstat (limited to 'packages/linux-kernel')
-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