commit 426742ebc577097c467716d9441113b3b81a4d4a
author Oleksandr Tymoshenko <ovt@google.com> Fri May 17 10:43:52 2024 +0000
committer COS Cherry Picker <cloud-image-release@prod.google.com> Sat May 18 02:08:29 2024 -0700
tree 2151cc5eca3e512e7c74035431ffd30ebb35d418
parent a4ca12df014dbc76ed3cc2aac72fc330a9a101a3

lakitu_defconfig: enable nftables FIB modules

BUG=b/336116235
TEST=presubmit
RELEASE_NOTE=Added support for nft_fib family of modules in the Linux kernel.

cos-patch: bug
Change-Id: I93bd635204a00aa5475481cb148e571d0f61c5d2
Signed-off-by: Oleksandr Tymoshenko <ovt@google.com>
Reviewed-on: https://cos-review.googlesource.com/c/third_party/kernel/+/71797
Main-Branch-Verified: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>
Reviewed-by: Kevin Berry <kpberry@google.com>
Tested-by: Cusky Presubmit Bot <presubmit@cos-infra-prod.iam.gserviceaccount.com>

arch/arm64/configs/lakitu_defconfig

diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index 2fa3445..7e8cebc 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -1207,6 +1207,8 @@
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1383,7 +1385,7 @@
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 # CONFIG_NFT_DUP_IPV4 is not set
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 # CONFIG_NF_TABLES_ARP is not set
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1423,7 +1425,7 @@
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 # CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=y
 CONFIG_NF_LOG_IPV6=m

arch/x86/configs/lakitu_defconfig

diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index 188ef02..772e64f 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -1257,6 +1257,8 @@
 CONFIG_NFT_REJECT_INET=m
 CONFIG_NFT_COMPAT=m
 CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
 CONFIG_NFT_XFRM=m
 CONFIG_NFT_SOCKET=m
 CONFIG_NFT_OSF=m
@@ -1433,7 +1435,7 @@
 CONFIG_NF_TABLES_IPV4=y
 CONFIG_NFT_REJECT_IPV4=m
 # CONFIG_NFT_DUP_IPV4 is not set
-# CONFIG_NFT_FIB_IPV4 is not set
+CONFIG_NFT_FIB_IPV4=m
 # CONFIG_NF_TABLES_ARP is not set
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_LOG_ARP=m
@@ -1473,7 +1475,7 @@
 CONFIG_NF_TABLES_IPV6=y
 CONFIG_NFT_REJECT_IPV6=m
 # CONFIG_NFT_DUP_IPV6 is not set
-# CONFIG_NFT_FIB_IPV6 is not set
+CONFIG_NFT_FIB_IPV6=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_REJECT_IPV6=y
 CONFIG_NF_LOG_IPV6=m