From 37cdda5adb5764b7bbbdf8c98a3bd3d0366be01b Mon Sep 17 00:00:00 2001 From: Robert Eckelmann Date: Fri, 14 Nov 2025 21:15:05 +0900 Subject: [PATCH] kconfigcheck: adjust requirements for IP_NF_IPTABLES_LEGACY & IP6_NF_IPTABLES_LEGACY These legacy options fail the kconfig check of `linux-google-nyan` which is currently at 6.6.17. This was discovered during the step to update the kconfig during !7273. According to https://cateee.net/lkddb/web-lkddb/IP_NF_IPTABLES_LEGACY.html and https://cateee.net/lkddb/web-lkddb/IP6_NF_IPTABLES_LEGACY.html were introduced with Kernel version 6.9 Signed-off-by: Robert Eckelmann Part-of: --- kconfigcheck.toml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/kconfigcheck.toml b/kconfigcheck.toml index 909955670..1c476c2b8 100644 --- a/kconfigcheck.toml +++ b/kconfigcheck.toml @@ -124,7 +124,6 @@ BRIDGE = "m" BRIDGE_VLAN_FILTERING = "y" CGROUP_BPF = "y" FUSE_FS = "m" -IP_NF_IPTABLES_LEGACY = "m" IP_NF_MANGLE = "m" NETFILTER_XTABLES = "m" NETFILTER_XT_MATCH_COMMENT = "m" @@ -139,6 +138,8 @@ VLAN_8021Q = "m" # prerequisite for bridge CROSS_MEMORY_ATTACH = "y" ["category:waydroid"."<5.18"."all"] ASHMEM = "y" +["category:waydroid".">=6.9"."all"] +IP_NF_IPTABLES_LEGACY = "m" ["category:waydroid".">=6.17"."all"] NETFILTER_XTABLES_LEGACY = "y" @@ -182,17 +183,18 @@ NF_REJECT_IPV4 = "m" IP_NF_IPTABLES = "m" IP_NF_FILTER = "m" IP_NF_TARGET_REJECT = "m" -IP_NF_IPTABLES_LEGACY = "m" IP_NF_NAT = "m" NF_TABLES_IPV6 = "y" NF_REJECT_IPV6 = "m" IP6_NF_IPTABLES = "m" -IP6_NF_IPTABLES_LEGACY = "m" IP6_NF_FILTER = "m" IP6_NF_TARGET_REJECT = "m" IP6_NF_NAT = "m" ["category:nftables".">=3.13.0 <5.17"."all"] NFT_COUNTER = "y" +["category:nftables".">=6.9"."all"] +IP_NF_IPTABLES_LEGACY = "m" +IP6_NF_IPTABLES_LEGACY = "m" ["category:nftables".">=6.17"."all"] NETFILTER_XTABLES_LEGACY = "y"