From nobody Sat Oct 11 06:27:59 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 490E2221264; Fri, 3 Oct 2025 20:57:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759525061; cv=none; b=oNaO2wl4n1+rEeXU9sEzAycSxWw86TT2HFXUoFqe8HrTnBNzFXraH461+dxVlV4mNmofyaIKFgMk9REkq8WnXRfBwjzEVP/K3gfaycCCswQz39eLp1Lv0ZCbNRlDE/zdWaZesAjGhcnrXxzc2ukbGIPgCbG+PukcMKlfNKoRgco= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759525061; c=relaxed/simple; bh=repfiGxh0uBEbAwntWKMavT38FNb7ANrRUXZEfcL8Vg=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FRq97Zd8JuFEzg1+Orasxxc8bGPuD+tZZZti9dHBkMv+M/WhoR+Lvty3cmhA5gS9wEfFUSCLrkWhZeEBzge24oAikSzDVv2gYCFiEthK85uTa5i4Sjs3LWSHKmbTnehCAePQl3pqmYY0XRxReIxCUz7UqyQhbYmBco5BQenM9cs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oPTEV3rc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oPTEV3rc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B1045C4CEF5; Fri, 3 Oct 2025 20:57:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759525060; bh=repfiGxh0uBEbAwntWKMavT38FNb7ANrRUXZEfcL8Vg=; h=From:To:Cc:Subject:Date:From; b=oPTEV3rc3CyRV47kxXJ3FhFyP2qwnAXzQOPeIMfftjx3wQhn6luN7tA8pkLESjx/O Pkmk5kG/hwJ4XAp+gQW8JT8ILnStP/u91ow31UulmV/wnSNuhOVcSSlTpJOtZfdLVd jBRqfErPkSFVhgHlHRsy6dEvPgacckruI1yUFv29dKZvAkX96rZr97XBhL1GlEhJ2k NA3bPxTOUX+oTLQIBWA4yiZlA1pA2H4cm66m+sm9qgo9sKUfVuCD4ekaV3qIIrtzJG 8COXWE/KsNjwTVieOnbI2swjieV4PTRLmgu1A+T0y1SBN+pVhHflcDxQxLZVjetOzL /Kl2BI3uV6wlQ== From: Jakub Kicinski To: davem@davemloft.net Cc: netdev@vger.kernel.org, edumazet@google.com, pabeni@redhat.com, andrew+netdev@lunn.ch, horms@kernel.org, Jakub Kicinski , Phil Sutter , "Matthieu Baerts (NGI0)" , Florian Westphal , Antonio Quartulli , jv@jvosburgh.net, shuah@kernel.org, kuniyu@google.com, martineau@kernel.org, geliang@kernel.org, pablo@netfilter.org, kadlec@netfilter.org, sd@queasysnail.net, razor@blackwall.org, idosch@nvidia.com, yongwang@nvidia.com, jiri@resnulli.us, danishanwar@ti.com, linux-kselftest@vger.kernel.org, mptcp@lists.linux.dev, netfilter-devel@vger.kernel.org, coreteam@netfilter.org Subject: [PATCH net repost] selftests: net: sort configs Date: Fri, 3 Oct 2025 13:57:36 -0700 Message-ID: <20251003205736.1019673-1-kuba@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Sort config files for networking selftests. This should help us avoid merge conflicts between net and net-next. patchwork check will be added to prevent new issues. Acked-by: Phil Sutter Acked-by: Matthieu Baerts (NGI0) Acked-by: Florian Westphal Acked-by: Antonio Quartulli Signed-off-by: Jakub Kicinski --- repost after the PR made the tree designation correct v1: https://lore.kernel.org/20251002015245.3209033-1-kuba@kernel.org CC: jv@jvosburgh.net CC: shuah@kernel.org CC: kuniyu@google.com CC: martineau@kernel.org CC: geliang@kernel.org CC: pablo@netfilter.org CC: kadlec@netfilter.org CC: sd@queasysnail.net CC: razor@blackwall.org CC: idosch@nvidia.com CC: yongwang@nvidia.com CC: jiri@resnulli.us CC: danishanwar@ti.com CC: linux-kselftest@vger.kernel.org CC: mptcp@lists.linux.dev CC: netfilter-devel@vger.kernel.org CC: coreteam@netfilter.org --- .../selftests/drivers/net/bonding/config | 8 +- tools/testing/selftests/drivers/net/config | 2 +- tools/testing/selftests/net/af_unix/config | 2 +- tools/testing/selftests/net/config | 140 +++++++++--------- tools/testing/selftests/net/forwarding/config | 34 ++--- tools/testing/selftests/net/hsr/config | 4 +- tools/testing/selftests/net/mptcp/config | 48 +++--- tools/testing/selftests/net/netfilter/config | 58 ++++---- tools/testing/selftests/net/ovpn/config | 12 +- .../testing/selftests/net/packetdrill/config | 4 +- tools/testing/selftests/net/tcp_ao/config | 2 +- 11 files changed, 157 insertions(+), 157 deletions(-) diff --git a/tools/testing/selftests/drivers/net/bonding/config b/tools/tes= ting/selftests/drivers/net/bonding/config index e5b7a8db4dfa..6bb290abd48b 100644 --- a/tools/testing/selftests/drivers/net/bonding/config +++ b/tools/testing/selftests/drivers/net/bonding/config @@ -1,17 +1,17 @@ CONFIG_BONDING=3Dy CONFIG_BRIDGE=3Dy CONFIG_DUMMY=3Dy +CONFIG_INET_ESP=3Dy +CONFIG_INET_ESP_OFFLOAD=3Dy CONFIG_IPV6=3Dy -CONFIG_MACVLAN=3Dy CONFIG_IPVLAN=3Dy +CONFIG_MACVLAN=3Dy CONFIG_NET_ACT_GACT=3Dy CONFIG_NET_CLS_FLOWER=3Dy CONFIG_NET_CLS_MATCHALL=3Dm +CONFIG_NETDEVSIM=3Dm CONFIG_NET_SCH_INGRESS=3Dy CONFIG_NLMON=3Dy CONFIG_VETH=3Dy CONFIG_VLAN_8021Q=3Dm -CONFIG_INET_ESP=3Dy -CONFIG_INET_ESP_OFFLOAD=3Dy CONFIG_XFRM_USER=3Dm -CONFIG_NETDEVSIM=3Dm diff --git a/tools/testing/selftests/drivers/net/config b/tools/testing/sel= ftests/drivers/net/config index 601431248d5b..77ccf83d87e0 100644 --- a/tools/testing/selftests/drivers/net/config +++ b/tools/testing/selftests/drivers/net/config @@ -3,8 +3,8 @@ CONFIG_DEBUG_INFO_BTF=3Dy CONFIG_DEBUG_INFO_BTF_MODULES=3Dn CONFIG_INET_PSP=3Dy CONFIG_IPV6=3Dy -CONFIG_NETDEVSIM=3Dm CONFIG_NETCONSOLE=3Dm CONFIG_NETCONSOLE_DYNAMIC=3Dy CONFIG_NETCONSOLE_EXTENDED_LOG=3Dy +CONFIG_NETDEVSIM=3Dm CONFIG_XDP_SOCKETS=3Dy diff --git a/tools/testing/selftests/net/af_unix/config b/tools/testing/sel= ftests/net/af_unix/config index 37368567768c..b5429c15a53c 100644 --- a/tools/testing/selftests/net/af_unix/config +++ b/tools/testing/selftests/net/af_unix/config @@ -1,3 +1,3 @@ -CONFIG_UNIX=3Dy CONFIG_AF_UNIX_OOB=3Dy +CONFIG_UNIX=3Dy CONFIG_UNIX_DIAG=3Dm diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/n= et/config index d548611e2698..1e1f253118f5 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -1,130 +1,130 @@ -CONFIG_USER_NS=3Dy -CONFIG_NET_NS=3Dy +CONFIG_AMT=3Dm +CONFIG_BAREUDP=3Dm CONFIG_BONDING=3Dm CONFIG_BPF_SYSCALL=3Dy -CONFIG_TEST_BPF=3Dm -CONFIG_NUMA=3Dy -CONFIG_RPS=3Dy -CONFIG_SYSFS=3Dy -CONFIG_PROC_SYSCTL=3Dy -CONFIG_NET_VRF=3Dy -CONFIG_NET_L3_MASTER_DEV=3Dy -CONFIG_IPV6=3Dy -CONFIG_IPV6_MULTIPLE_TABLES=3Dy -CONFIG_VETH=3Dy -CONFIG_NET_IPVTI=3Dy -CONFIG_IPV6_VTI=3Dy -CONFIG_DUMMY=3Dy -CONFIG_BRIDGE_VLAN_FILTERING=3Dy CONFIG_BRIDGE=3Dy +CONFIG_BRIDGE_VLAN_FILTERING=3Dy +CONFIG_CAN=3Dm +CONFIG_CAN_DEV=3Dm +CONFIG_CAN_VXCAN=3Dm +CONFIG_CRYPTO_ARIA=3Dy CONFIG_CRYPTO_CHACHA20POLY1305=3Dm +CONFIG_CRYPTO_SHA1=3Dy +CONFIG_CRYPTO_SM4_GENERIC=3Dy CONFIG_DEBUG_INFO_BTF=3Dy CONFIG_DEBUG_INFO_BTF_MODULES=3Dn -CONFIG_VLAN_8021Q=3Dy +CONFIG_DUMMY=3Dy CONFIG_GENEVE=3Dm CONFIG_IFB=3Dy CONFIG_INET_DIAG=3Dy CONFIG_INET_ESP=3Dy CONFIG_INET_ESP_OFFLOAD=3Dy -CONFIG_CRYPTO_SHA1=3Dy -CONFIG_NET_FOU=3Dy -CONFIG_NET_FOU_IP_TUNNELS=3Dy -CONFIG_NETFILTER=3Dy -CONFIG_NETFILTER_ADVANCED=3Dy -CONFIG_NETFILTER_XTABLES_LEGACY=3Dy -CONFIG_NF_CONNTRACK=3Dm -CONFIG_IPV6_MROUTE=3Dy -CONFIG_IPV6_SIT=3Dy -CONFIG_NF_NAT=3Dm +CONFIG_IP6_NF_FILTER=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_IPTABLES_LEGACY=3Dm -CONFIG_IP_NF_IPTABLES=3Dm -CONFIG_IP_NF_IPTABLES_LEGACY=3Dm CONFIG_IP6_NF_MANGLE=3Dm -CONFIG_IP6_NF_FILTER=3Dm +CONFIG_IP6_NF_MATCH_RPFILTER=3Dm CONFIG_IP6_NF_NAT=3Dm CONFIG_IP6_NF_RAW=3Dm -CONFIG_IP_NF_MANGLE=3Dm +CONFIG_IP6_NF_TARGET_REJECT=3Dm CONFIG_IP_NF_FILTER=3Dm +CONFIG_IP_NF_IPTABLES=3Dm +CONFIG_IP_NF_IPTABLES_LEGACY=3Dm +CONFIG_IP_NF_MANGLE=3Dm +CONFIG_IP_NF_MATCH_RPFILTER=3Dm CONFIG_IP_NF_NAT=3Dm CONFIG_IP_NF_RAW=3Dm CONFIG_IP_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm CONFIG_IP_NF_TARGET_TTL=3Dm +CONFIG_IP_SCTP=3Dm +CONFIG_IPV6=3Dy CONFIG_IPV6_GRE=3Dm +CONFIG_IPV6_ILA=3Dm +CONFIG_IPV6_IOAM6_LWTUNNEL=3Dy +CONFIG_IPV6_MROUTE=3Dy +CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_IPV6_RPL_LWTUNNEL=3Dy CONFIG_IPV6_SEG6_LWTUNNEL=3Dy +CONFIG_IPV6_SIT=3Dy +CONFIG_IPV6_VTI=3Dy +CONFIG_IPVLAN=3Dm +CONFIG_KALLSYMS=3Dy +CONFIG_L2TP=3Dm CONFIG_L2TP_ETH=3Dm CONFIG_L2TP_IP=3Dm -CONFIG_L2TP=3Dm CONFIG_L2TP_V3=3Dy CONFIG_MACSEC=3Dm CONFIG_MACVLAN=3Dy CONFIG_MACVTAP=3Dy CONFIG_MPLS=3Dy +CONFIG_MPLS_IPTUNNEL=3Dm +CONFIG_MPLS_ROUTING=3Dm CONFIG_MPTCP=3Dy -CONFIG_NF_TABLES=3Dm -CONFIG_NF_TABLES_IPV6=3Dy -CONFIG_NF_TABLES_IPV4=3Dy -CONFIG_NFT_NAT=3Dm -CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm -CONFIG_NETFILTER_XT_TARGET_HL=3Dm -CONFIG_NETFILTER_XT_NAT=3Dm CONFIG_NET_ACT_CSUM=3Dm CONFIG_NET_ACT_CT=3Dm CONFIG_NET_ACT_GACT=3Dm +CONFIG_NET_ACT_MIRRED=3Dm CONFIG_NET_ACT_PEDIT=3Dm +CONFIG_NET_ACT_TUNNEL_KEY=3Dm CONFIG_NET_CLS_BASIC=3Dm CONFIG_NET_CLS_BPF=3Dm +CONFIG_NET_CLS_FLOWER=3Dm CONFIG_NET_CLS_MATCHALL=3Dm CONFIG_NET_CLS_U32=3Dm -CONFIG_NET_IPGRE_DEMUX=3Dm +CONFIG_NETDEVSIM=3Dm +CONFIG_NET_DROP_MONITOR=3Dm +CONFIG_NETFILTER=3Dy +CONFIG_NETFILTER_ADVANCED=3Dy +CONFIG_NETFILTER_XTABLES_LEGACY=3Dy +CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm +CONFIG_NETFILTER_XT_MATCH_POLICY=3Dm +CONFIG_NETFILTER_XT_NAT=3Dm +CONFIG_NETFILTER_XT_TARGET_HL=3Dm +CONFIG_NET_FOU=3Dy +CONFIG_NET_FOU_IP_TUNNELS=3Dy CONFIG_NET_IPGRE=3Dm +CONFIG_NET_IPGRE_DEMUX=3Dm CONFIG_NET_IPIP=3Dy +CONFIG_NET_IPVTI=3Dy +CONFIG_NETKIT=3Dy +CONFIG_NET_L3_MASTER_DEV=3Dy +CONFIG_NET_NS=3Dy +CONFIG_NET_PKTGEN=3Dm +CONFIG_NET_SCH_ETF=3Dm +CONFIG_NET_SCH_FQ=3Dm CONFIG_NET_SCH_FQ_CODEL=3Dm CONFIG_NET_SCH_HTB=3Dm -CONFIG_NET_SCH_FQ=3Dm -CONFIG_NET_SCH_ETF=3Dm +CONFIG_NET_SCH_INGRESS=3Dm CONFIG_NET_SCH_NETEM=3Dy CONFIG_NET_SCH_PRIO=3Dm -CONFIG_NFT_COMPAT=3Dm +CONFIG_NET_VRF=3Dy +CONFIG_NF_CONNTRACK=3Dm CONFIG_NF_CONNTRACK_OVS=3Dy CONFIG_NF_FLOW_TABLE=3Dm +CONFIG_NF_NAT=3Dm +CONFIG_NF_TABLES=3Dm +CONFIG_NF_TABLES_IPV4=3Dy +CONFIG_NF_TABLES_IPV6=3Dy +CONFIG_NFT_COMPAT=3Dm +CONFIG_NFT_NAT=3Dm +CONFIG_NUMA=3Dy CONFIG_OPENVSWITCH=3Dm CONFIG_OPENVSWITCH_GENEVE=3Dm CONFIG_OPENVSWITCH_GRE=3Dm CONFIG_OPENVSWITCH_VXLAN=3Dm +CONFIG_PROC_SYSCTL=3Dy CONFIG_PSAMPLE=3Dm +CONFIG_RPS=3Dy +CONFIG_SYSFS=3Dy CONFIG_TCP_MD5SIG=3Dy CONFIG_TEST_BLACKHOLE_DEV=3Dm -CONFIG_KALLSYMS=3Dy +CONFIG_TEST_BPF=3Dm CONFIG_TLS=3Dm CONFIG_TRACEPOINTS=3Dy -CONFIG_NET_DROP_MONITOR=3Dm -CONFIG_NETDEVSIM=3Dm -CONFIG_MPLS_ROUTING=3Dm -CONFIG_MPLS_IPTUNNEL=3Dm -CONFIG_NET_SCH_INGRESS=3Dm -CONFIG_NET_CLS_FLOWER=3Dm -CONFIG_NET_ACT_TUNNEL_KEY=3Dm -CONFIG_NET_ACT_MIRRED=3Dm -CONFIG_BAREUDP=3Dm -CONFIG_IPV6_IOAM6_LWTUNNEL=3Dy -CONFIG_CRYPTO_SM4_GENERIC=3Dy -CONFIG_AMT=3Dm CONFIG_TUN=3Dy +CONFIG_USER_NS=3Dy +CONFIG_VETH=3Dy +CONFIG_VLAN_8021Q=3Dy CONFIG_VXLAN=3Dm -CONFIG_IP_SCTP=3Dm -CONFIG_NETFILTER_XT_MATCH_POLICY=3Dm -CONFIG_CRYPTO_ARIA=3Dy CONFIG_XFRM_INTERFACE=3Dm CONFIG_XFRM_USER=3Dm -CONFIG_IP_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IPVLAN=3Dm -CONFIG_CAN=3Dm -CONFIG_CAN_DEV=3Dm -CONFIG_CAN_VXCAN=3Dm -CONFIG_NETKIT=3Dy -CONFIG_NET_PKTGEN=3Dm -CONFIG_IPV6_ILA=3Dm -CONFIG_IPV6_RPL_LWTUNNEL=3Dy diff --git a/tools/testing/selftests/net/forwarding/config b/tools/testing/= selftests/net/forwarding/config index 18fd69d8d937..ce64518aaa11 100644 --- a/tools/testing/selftests/net/forwarding/config +++ b/tools/testing/selftests/net/forwarding/config @@ -1,24 +1,23 @@ -CONFIG_BRIDGE=3Dm -CONFIG_VLAN_8021Q=3Dm -CONFIG_BRIDGE_VLAN_FILTERING=3Dy -CONFIG_BRIDGE_IGMP_SNOOPING=3Dy -CONFIG_NET_L3_MASTER_DEV=3Dy -CONFIG_IPV6_MULTIPLE_TABLES=3Dy -CONFIG_NET_VRF=3Dm CONFIG_BPF_SYSCALL=3Dy +CONFIG_BRIDGE=3Dm +CONFIG_BRIDGE_IGMP_SNOOPING=3Dy +CONFIG_BRIDGE_VLAN_FILTERING=3Dy CONFIG_CGROUP_BPF=3Dy CONFIG_DUMMY=3Dm -CONFIG_IPV6=3Dy -CONFIG_IPV6_GRE=3Dm -CONFIG_IPV6_MROUTE=3Dy -CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=3Dy -CONFIG_IPV6_PIMSM_V2=3Dy CONFIG_IP_MROUTE=3Dy CONFIG_IP_MROUTE_MULTIPLE_TABLES=3Dy CONFIG_IP_PIMSM_V1=3Dy CONFIG_IP_PIMSM_V2=3Dy +CONFIG_IPV6=3Dy +CONFIG_IPV6_GRE=3Dm +CONFIG_IPV6_MROUTE=3Dy +CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=3Dy +CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_IPV6_PIMSM_V2=3Dy CONFIG_MACVLAN=3Dm +CONFIG_NAMESPACES=3Dy CONFIG_NET_ACT_CT=3Dm +CONFIG_NET_ACT_GACT=3Dm CONFIG_NET_ACT_MIRRED=3Dm CONFIG_NET_ACT_MPLS=3Dm CONFIG_NET_ACT_PEDIT=3Dm @@ -27,29 +26,30 @@ CONFIG_NET_ACT_SAMPLE=3Dm CONFIG_NET_ACT_SKBEDIT=3Dm CONFIG_NET_ACT_TUNNEL_KEY=3Dm CONFIG_NET_ACT_VLAN=3Dm +CONFIG_NET_CLS_BASIC=3Dm CONFIG_NET_CLS_FLOWER=3Dm CONFIG_NET_CLS_MATCHALL=3Dm -CONFIG_NET_CLS_BASIC=3Dm CONFIG_NET_EMATCH=3Dy CONFIG_NET_EMATCH_META=3Dm +CONFIG_NETFILTER=3Dy CONFIG_NET_IPGRE=3Dm CONFIG_NET_IPGRE_DEMUX=3Dm CONFIG_NET_IPIP=3Dm +CONFIG_NET_L3_MASTER_DEV=3Dy +CONFIG_NET_NS=3Dy CONFIG_NET_SCH_ETS=3Dm CONFIG_NET_SCH_INGRESS=3Dm -CONFIG_NET_ACT_GACT=3Dm CONFIG_NET_SCH_PRIO=3Dm CONFIG_NET_SCH_RED=3Dm CONFIG_NET_SCH_TBF=3Dm CONFIG_NET_TC_SKB_EXT=3Dy CONFIG_NET_TEAM=3Dy CONFIG_NET_TEAM_MODE_LOADBALANCE=3Dy -CONFIG_NETFILTER=3Dy +CONFIG_NET_VRF=3Dm CONFIG_NF_CONNTRACK=3Dm CONFIG_NF_FLOW_TABLE=3Dm CONFIG_NF_TABLES=3Dm CONFIG_VETH=3Dm -CONFIG_NAMESPACES=3Dy -CONFIG_NET_NS=3Dy +CONFIG_VLAN_8021Q=3Dm CONFIG_VXLAN=3Dm CONFIG_XFRM_USER=3Dm diff --git a/tools/testing/selftests/net/hsr/config b/tools/testing/selftes= ts/net/hsr/config index 555a868743f0..205cc4d3d64b 100644 --- a/tools/testing/selftests/net/hsr/config +++ b/tools/testing/selftests/net/hsr/config @@ -1,6 +1,6 @@ +CONFIG_BRIDGE=3Dy +CONFIG_HSR=3Dy CONFIG_IPV6=3Dy CONFIG_NET_SCH_NETEM=3Dm -CONFIG_HSR=3Dy CONFIG_VETH=3Dy -CONFIG_BRIDGE=3Dy CONFIG_VLAN_8021Q=3Dm diff --git a/tools/testing/selftests/net/mptcp/config b/tools/testing/selft= ests/net/mptcp/config index 968d440c03fe..59051ee2a986 100644 --- a/tools/testing/selftests/net/mptcp/config +++ b/tools/testing/selftests/net/mptcp/config @@ -1,36 +1,36 @@ -CONFIG_KALLSYMS=3Dy -CONFIG_MPTCP=3Dy -CONFIG_IPV6=3Dy -CONFIG_MPTCP_IPV6=3Dy CONFIG_INET_DIAG=3Dm CONFIG_INET_MPTCP_DIAG=3Dm -CONFIG_VETH=3Dy -CONFIG_NET_SCH_NETEM=3Dm -CONFIG_SYN_COOKIES=3Dy +CONFIG_IP6_NF_FILTER=3Dm +CONFIG_IP6_NF_TARGET_REJECT=3Dm +CONFIG_IP_ADVANCED_ROUTER=3Dy +CONFIG_IP_MULTIPLE_TABLES=3Dy +CONFIG_IP_NF_FILTER=3Dm +CONFIG_IP_NF_MANGLE=3Dm +CONFIG_IP_NF_TARGET_REJECT=3Dm +CONFIG_IPV6=3Dy +CONFIG_IPV6_MULTIPLE_TABLES=3Dy +CONFIG_KALLSYMS=3Dy +CONFIG_MPTCP=3Dy +CONFIG_MPTCP_IPV6=3Dy +CONFIG_NET_ACT_CSUM=3Dm +CONFIG_NET_ACT_PEDIT=3Dm +CONFIG_NET_CLS_ACT=3Dy +CONFIG_NET_CLS_FW=3Dm CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_ADVANCED=3Dy CONFIG_NETFILTER_NETLINK=3Dm -CONFIG_NF_TABLES=3Dm -CONFIG_NFT_COMPAT=3Dm CONFIG_NETFILTER_XTABLES=3Dm CONFIG_NETFILTER_XTABLES_LEGACY=3Dy CONFIG_NETFILTER_XT_MATCH_BPF=3Dm CONFIG_NETFILTER_XT_MATCH_LENGTH=3Dm CONFIG_NETFILTER_XT_MATCH_STATISTIC=3Dm CONFIG_NETFILTER_XT_TARGET_MARK=3Dm -CONFIG_NF_TABLES_INET=3Dy -CONFIG_NFT_TPROXY=3Dm -CONFIG_NFT_SOCKET=3Dm -CONFIG_IP_ADVANCED_ROUTER=3Dy -CONFIG_IP_MULTIPLE_TABLES=3Dy -CONFIG_IP_NF_FILTER=3Dm -CONFIG_IP_NF_MANGLE=3Dm -CONFIG_IP_NF_TARGET_REJECT=3Dm -CONFIG_IP6_NF_TARGET_REJECT=3Dm -CONFIG_IPV6_MULTIPLE_TABLES=3Dy -CONFIG_IP6_NF_FILTER=3Dm -CONFIG_NET_ACT_CSUM=3Dm -CONFIG_NET_ACT_PEDIT=3Dm -CONFIG_NET_CLS_ACT=3Dy -CONFIG_NET_CLS_FW=3Dm CONFIG_NET_SCH_INGRESS=3Dm +CONFIG_NET_SCH_NETEM=3Dm +CONFIG_NF_TABLES=3Dm +CONFIG_NF_TABLES_INET=3Dy +CONFIG_NFT_COMPAT=3Dm +CONFIG_NFT_SOCKET=3Dm +CONFIG_NFT_TPROXY=3Dm +CONFIG_SYN_COOKIES=3Dy +CONFIG_VETH=3Dy diff --git a/tools/testing/selftests/net/netfilter/config b/tools/testing/s= elftests/net/netfilter/config index 305e46b819cb..12ce61fa15a8 100644 --- a/tools/testing/selftests/net/netfilter/config +++ b/tools/testing/selftests/net/netfilter/config @@ -1,77 +1,80 @@ CONFIG_AUDIT=3Dy CONFIG_BPF_SYSCALL=3Dy CONFIG_BRIDGE=3Dm -CONFIG_NETFILTER_XTABLES_LEGACY=3Dy -CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_EBT_BROUTE=3Dm CONFIG_BRIDGE_EBT_IP=3Dm CONFIG_BRIDGE_EBT_REDIRECT=3Dm CONFIG_BRIDGE_EBT_T_FILTER=3Dm CONFIG_BRIDGE_NETFILTER=3Dm CONFIG_BRIDGE_NF_EBTABLES=3Dm +CONFIG_BRIDGE_NF_EBTABLES_LEGACY=3Dm CONFIG_BRIDGE_VLAN_FILTERING=3Dy CONFIG_CGROUP_BPF=3Dy -CONFIG_DUMMY=3Dm -CONFIG_INET_ESP=3Dm CONFIG_CRYPTO_SHA1=3Dm -CONFIG_IP_NF_MATCH_RPFILTER=3Dm -CONFIG_IP6_NF_MATCH_RPFILTER=3Dm -CONFIG_IP_NF_IPTABLES=3Dm -CONFIG_IP_NF_IPTABLES_LEGACY=3Dm +CONFIG_DUMMY=3Dm +CONFIG_INET_DIAG=3Dm +CONFIG_INET_ESP=3Dm +CONFIG_INET_SCTP_DIAG=3Dm +CONFIG_IP6_NF_FILTER=3Dm CONFIG_IP6_NF_IPTABLES=3Dm CONFIG_IP6_NF_IPTABLES_LEGACY=3Dm -CONFIG_IP_NF_NAT=3Dm -CONFIG_IP_NF_FILTER=3Dm -CONFIG_IP6_NF_FILTER=3Dm -CONFIG_IP_NF_RAW=3Dm +CONFIG_IP6_NF_MATCH_RPFILTER=3Dm CONFIG_IP6_NF_RAW=3Dm +CONFIG_IP_NF_FILTER=3Dm +CONFIG_IP_NF_IPTABLES=3Dm +CONFIG_IP_NF_IPTABLES_LEGACY=3Dm +CONFIG_IP_NF_MATCH_RPFILTER=3Dm +CONFIG_IP_NF_NAT=3Dm +CONFIG_IP_NF_RAW=3Dm CONFIG_IP_SCTP=3Dm +CONFIG_IPV6=3Dy +CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_IP_VS=3Dm CONFIG_IP_VS_PROTO_TCP=3Dy CONFIG_IP_VS_RR=3Dm -CONFIG_IPV6=3Dy -CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_MACVLAN=3Dm CONFIG_NAMESPACES=3Dy CONFIG_NET_CLS_U32=3Dm -CONFIG_NET_L3_MASTER_DEV=3Dy -CONFIG_NET_NS=3Dy -CONFIG_NET_SCH_NETEM=3Dm -CONFIG_NET_SCH_HTB=3Dm -CONFIG_NET_IPIP=3Dm -CONFIG_NET_VRF=3Dy CONFIG_NETFILTER=3Dy CONFIG_NETFILTER_ADVANCED=3Dy CONFIG_NETFILTER_NETLINK=3Dm CONFIG_NETFILTER_NETLINK_QUEUE=3Dm CONFIG_NETFILTER_SYNPROXY=3Dm CONFIG_NETFILTER_XTABLES=3Dm -CONFIG_NETFILTER_XT_NAT=3Dm +CONFIG_NETFILTER_XTABLES_LEGACY=3Dy CONFIG_NETFILTER_XT_MATCH_CONNTRACK=3Dm CONFIG_NETFILTER_XT_MATCH_STATE=3Dm CONFIG_NETFILTER_XT_MATCH_STRING=3Dm +CONFIG_NETFILTER_XT_NAT=3Dm CONFIG_NETFILTER_XT_TARGET_REDIRECT=3Dm +CONFIG_NET_IPIP=3Dm +CONFIG_NET_L3_MASTER_DEV=3Dy +CONFIG_NET_NS=3Dy +CONFIG_NET_PKTGEN=3Dm +CONFIG_NET_SCH_HTB=3Dm +CONFIG_NET_SCH_NETEM=3Dm +CONFIG_NET_VRF=3Dy CONFIG_NF_CONNTRACK=3Dm -CONFIG_NF_CONNTRACK_PROCFS=3Dy CONFIG_NF_CONNTRACK_EVENTS=3Dy CONFIG_NF_CONNTRACK_FTP=3Dm CONFIG_NF_CONNTRACK_MARK=3Dy +CONFIG_NF_CONNTRACK_PROCFS=3Dy CONFIG_NF_CONNTRACK_ZONES=3Dy CONFIG_NF_CT_NETLINK=3Dm CONFIG_NF_CT_PROTO_SCTP=3Dy CONFIG_NF_FLOW_TABLE=3Dm +CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NF_LOG_IPV4=3Dm CONFIG_NF_LOG_IPV6=3Dm CONFIG_NF_NAT=3Dm -CONFIG_NF_NAT_REDIRECT=3Dy CONFIG_NF_NAT_MASQUERADE=3Dy +CONFIG_NF_NAT_REDIRECT=3Dy CONFIG_NF_TABLES=3Dm CONFIG_NF_TABLES_BRIDGE=3Dm CONFIG_NF_TABLES_INET=3Dy CONFIG_NF_TABLES_IPV4=3Dy CONFIG_NF_TABLES_IPV6=3Dy CONFIG_NF_TABLES_NETDEV=3Dy -CONFIG_NF_FLOW_TABLE_INET=3Dm CONFIG_NFT_BRIDGE_META=3Dm CONFIG_NFT_COMPAT=3Dm CONFIG_NFT_CT=3Dm @@ -90,12 +93,9 @@ CONFIG_NFT_QUOTA=3Dm CONFIG_NFT_REDIR=3Dm CONFIG_NFT_SYNPROXY=3Dm CONFIG_NFT_TPROXY=3Dm +CONFIG_TUN=3Dm CONFIG_VETH=3Dm CONFIG_VLAN_8021Q=3Dm CONFIG_VXLAN=3Dm -CONFIG_XFRM_USER=3Dm CONFIG_XFRM_STATISTICS=3Dy -CONFIG_NET_PKTGEN=3Dm -CONFIG_TUN=3Dm -CONFIG_INET_DIAG=3Dm -CONFIG_INET_SCTP_DIAG=3Dm +CONFIG_XFRM_USER=3Dm diff --git a/tools/testing/selftests/net/ovpn/config b/tools/testing/selfte= sts/net/ovpn/config index 71946ba9fa17..42699740936d 100644 --- a/tools/testing/selftests/net/ovpn/config +++ b/tools/testing/selftests/net/ovpn/config @@ -1,10 +1,10 @@ -CONFIG_NET=3Dy -CONFIG_INET=3Dy -CONFIG_STREAM_PARSER=3Dy -CONFIG_NET_UDP_TUNNEL=3Dy -CONFIG_DST_CACHE=3Dy CONFIG_CRYPTO=3Dy CONFIG_CRYPTO_AES=3Dy -CONFIG_CRYPTO_GCM=3Dy CONFIG_CRYPTO_CHACHA20POLY1305=3Dy +CONFIG_CRYPTO_GCM=3Dy +CONFIG_DST_CACHE=3Dy +CONFIG_INET=3Dy +CONFIG_NET=3Dy +CONFIG_NET_UDP_TUNNEL=3Dy CONFIG_OVPN=3Dm +CONFIG_STREAM_PARSER=3Dy diff --git a/tools/testing/selftests/net/packetdrill/config b/tools/testing= /selftests/net/packetdrill/config index 0237ed98f3c0..c4a19a785521 100644 --- a/tools/testing/selftests/net/packetdrill/config +++ b/tools/testing/selftests/net/packetdrill/config @@ -1,6 +1,6 @@ -CONFIG_IPV6=3Dy -CONFIG_HZ_1000=3Dy CONFIG_HZ=3D1000 +CONFIG_HZ_1000=3Dy +CONFIG_IPV6=3Dy CONFIG_NET_NS=3Dy CONFIG_NET_SCH_FIFO=3Dy CONFIG_NET_SCH_FQ=3Dy diff --git a/tools/testing/selftests/net/tcp_ao/config b/tools/testing/self= tests/net/tcp_ao/config index 3605e38711cb..971cb6fa2d63 100644 --- a/tools/testing/selftests/net/tcp_ao/config +++ b/tools/testing/selftests/net/tcp_ao/config @@ -1,8 +1,8 @@ CONFIG_CRYPTO_HMAC=3Dy CONFIG_CRYPTO_RMD160=3Dy CONFIG_CRYPTO_SHA1=3Dy -CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_IPV6=3Dy +CONFIG_IPV6_MULTIPLE_TABLES=3Dy CONFIG_NET_L3_MASTER_DEV=3Dy CONFIG_NET_VRF=3Dy CONFIG_TCP_AO=3Dy --=20 2.51.0