[SRU][F][PATCH 1/1] Set CONFIG_NET_IPIP and CONIG_IPV6_SIT =m

Khalid Elmously khalid.elmously at canonical.com
Thu Oct 15 02:18:23 UTC 2020


BugLink: https://bugs.launchpad.net/bugs/1899832

There's no good reason for these modules to be statically built-in, and they are causing test validation problems on some clouds.

Signed-off-by: Khalid Elmously <khalid.elmously at canonical.com>
---
 debian.kvm/config/config.common.ubuntu | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian.kvm/config/config.common.ubuntu b/debian.kvm/config/config.common.ubuntu
index 9bf9be9eb4bd..ecad0df5219f 100644
--- a/debian.kvm/config/config.common.ubuntu
+++ b/debian.kvm/config/config.common.ubuntu
@@ -1140,7 +1140,7 @@ CONFIG_INET_ESP_OFFLOAD=m
 CONFIG_INET_IPCOMP=m
 # CONFIG_INET_RAW_DIAG is not set
 CONFIG_INET_TCP_DIAG=y
-CONFIG_INET_TUNNEL=y
+CONFIG_INET_TUNNEL=m
 # CONFIG_INET_UDP_DIAG is not set
 CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
@@ -1231,7 +1231,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_SEG6_HMAC is not set
 # CONFIG_IPV6_SEG6_LWTUNNEL is not set
-CONFIG_IPV6_SIT=y
+CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_SUBTREES=y
 # CONFIG_IPV6_TUNNEL is not set
@@ -1661,9 +1661,9 @@ CONFIG_NET_FLOW_LIMIT=y
 # CONFIG_NET_IFE is not set
 CONFIG_NET_INGRESS=y
 # CONFIG_NET_IPGRE_DEMUX is not set
-CONFIG_NET_IPIP=y
+CONFIG_NET_IPIP=m
 # CONFIG_NET_IPVTI is not set
-CONFIG_NET_IP_TUNNEL=y
+CONFIG_NET_IP_TUNNEL=m
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_L3_MASTER_DEV=y
-- 
2.17.1




More information about the kernel-team mailing list