Unverified Commit b12fda53 authored Feb 07, 2024 by openeuler-ci-bot Committed by Gitee Feb 07, 2024

!3698 enable ARM64/X86_64 CONFIG_MPTCP/CONFIG_MPTCP_IPV6 config

Merge Pull Request from: @bitcoffee 
 
【ISSUE】
https://gitee.com/openeuler/kernel/issues/I8O9OS 
 
Link:https://gitee.com/openeuler/kernel/pulls/3698

 

Reviewed-by: Liu Chao <liuchao173@huawei.com>
Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com>
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>

parents 9e9c8d46 9ebdcec2

arch/arm64/configs/openeuler_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -1308,7 +1308,8 @@ CONFIG_IPV6_PIMSM_V2=y
		# CONFIG_IPV6_RPL_LWTUNNEL is not set
		# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
		CONFIG_NETLABEL=y
		# CONFIG_MPTCP is not set
		CONFIG_MPTCP=y
		CONFIG_MPTCP_IPV6=y
		CONFIG_NETWORK_SECMARK=y
		CONFIG_NET_PTP_CLASSIFY=y
		CONFIG_NETWORK_PHY_TIMESTAMPING=y

arch/x86/configs/openeuler_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -1316,7 +1316,8 @@ CONFIG_IPV6_PIMSM_V2=y
		# CONFIG_IPV6_RPL_LWTUNNEL is not set
		# CONFIG_IPV6_IOAM6_LWTUNNEL is not set
		CONFIG_NETLABEL=y
		# CONFIG_MPTCP is not set
		CONFIG_MPTCP=y
		CONFIG_MPTCP_IPV6=y
		CONFIG_NETWORK_SECMARK=y
		CONFIG_NET_PTP_CLASSIFY=y
		CONFIG_NETWORK_PHY_TIMESTAMPING=y