From e2954517daded8c9577c231423ccc1a92dd0c390 Mon Sep 17 00:00:00 2001 From: Yang Yingliang Date: Wed, 5 Dec 2018 18:35:24 +0800 Subject: [PATCH] config: change CONFIG_*TUNNEL to m euler inclusion category: feature bugzilla: 4979 CVE: NA --------------------------------------- CONFIG_NET_IPIP CONFIG_NET_IP_TUNNEL CONFIG_NET_UDP_TUNNEL CONFIG_NET_FOU CONFIG_INET_TUNNEL CONFIG_INET6_TUNNEL CONFIG_IPV6_TUNNEL CONFIG_IPV6_FOU CONFIG_IPV6_FOU_TUNNEL CONFIG_VXLAN These configs are changed to m. Signed-off-by: Yang Yingliang Reviewed-by: Xie XiuQi --- arch/arm64/configs/hulk_defconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm64/configs/hulk_defconfig b/arch/arm64/configs/hulk_defconfig index ddf8c3fa4929..fecfbee6745d 100644 --- a/arch/arm64/configs/hulk_defconfig +++ b/arch/arm64/configs/hulk_defconfig @@ -976,9 +976,9 @@ CONFIG_IP_PNP=y CONFIG_IP_PNP_DHCP=y CONFIG_IP_PNP_BOOTP=y # CONFIG_IP_PNP_RARP is not set -CONFIG_NET_IPIP=y +CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m -CONFIG_NET_IP_TUNNEL=y +CONFIG_NET_IP_TUNNEL=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IP_MROUTE_COMMON=y @@ -988,15 +988,15 @@ CONFIG_IP_PIMSM_V1=y CONFIG_IP_PIMSM_V2=y CONFIG_SYN_COOKIES=y CONFIG_NET_IPVTI=m -CONFIG_NET_UDP_TUNNEL=y -CONFIG_NET_FOU=y +CONFIG_NET_UDP_TUNNEL=m +CONFIG_NET_FOU=m CONFIG_NET_FOU_IP_TUNNELS=y CONFIG_INET_AH=m CONFIG_INET_ESP=m # CONFIG_INET_ESP_OFFLOAD is not set CONFIG_INET_IPCOMP=m CONFIG_INET_XFRM_TUNNEL=m -CONFIG_INET_TUNNEL=y +CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m @@ -1037,7 +1037,7 @@ CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m # CONFIG_IPV6_ILA is not set CONFIG_INET6_XFRM_TUNNEL=m -CONFIG_INET6_TUNNEL=y +CONFIG_INET6_TUNNEL=m CONFIG_INET6_XFRM_MODE_TRANSPORT=m CONFIG_INET6_XFRM_MODE_TUNNEL=m CONFIG_INET6_XFRM_MODE_BEET=m @@ -1046,10 +1046,10 @@ CONFIG_IPV6_VTI=m CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_NDISC_NODETYPE=y -CONFIG_IPV6_TUNNEL=y +CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_GRE=m -CONFIG_IPV6_FOU=y -CONFIG_IPV6_FOU_TUNNEL=y +CONFIG_IPV6_FOU=m +CONFIG_IPV6_FOU_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IPV6_MROUTE=y @@ -2417,7 +2417,7 @@ CONFIG_NET_TEAM_MODE_LOADBALANCE=m CONFIG_MACVLAN=m CONFIG_MACVTAP=m # CONFIG_IPVLAN is not set -CONFIG_VXLAN=y +CONFIG_VXLAN=m CONFIG_GENEVE=m # CONFIG_GTP is not set # CONFIG_MACSEC is not set -- GitLab