diff mbox

[8/8] UBUNTU: [Config] Sync IPsec config options

Message ID 1403911081-32056-9-git-send-email-tyhicks@canonical.com
State New
Headers show

Commit Message

Tyler Hicks June 27, 2014, 11:18 p.m. UTC 
Sync with the traditional Ubuntu kernel config options in regards to
ipsec options.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>
---
 debian.flo/config/config.common.ubuntu | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)
diff mbox

Patch

diff --git a/debian.flo/config/config.common.ubuntu b/debian.flo/config/config.common.ubuntu
index 155658c..955dec7 100644
--- a/debian.flo/config/config.common.ubuntu
+++ b/debian.flo/config/config.common.ubuntu
@@ -1120,27 +1120,27 @@  CONFIG_IMA_MEASURE_PCR_IDX=10
 # CONFIG_IMX111_ACT is not set
 # CONFIG_IMX119 is not set
 CONFIG_INET=y
-CONFIG_INET6_AH=y
-CONFIG_INET6_ESP=y
-CONFIG_INET6_IPCOMP=y
-CONFIG_INET6_TUNNEL=y
-CONFIG_INET6_XFRM_MODE_BEET=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_INET6_XFRM_MODE_BEET=m
 # CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set
-CONFIG_INET6_XFRM_MODE_TRANSPORT=y
-CONFIG_INET6_XFRM_MODE_TUNNEL=y
-CONFIG_INET6_XFRM_TUNNEL=y
-# CONFIG_INET_AH is not set
+CONFIG_INET6_XFRM_MODE_TRANSPORT=m
+CONFIG_INET6_XFRM_MODE_TUNNEL=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET_AH=m
 CONFIG_INET_DIAG=y
-CONFIG_INET_ESP=y
-# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
 # CONFIG_INET_LRO is not set
 CONFIG_INET_TCP_DIAG=y
 CONFIG_INET_TUNNEL=y
 # CONFIG_INET_UDP_DIAG is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-CONFIG_INET_XFRM_MODE_TRANSPORT=y
-CONFIG_INET_XFRM_MODE_TUNNEL=y
-# CONFIG_INET_XFRM_TUNNEL is not set
+CONFIG_INET_XFRM_MODE_BEET=m
+CONFIG_INET_XFRM_MODE_TRANSPORT=m
+CONFIG_INET_XFRM_MODE_TUNNEL=m
+CONFIG_INET_XFRM_TUNNEL=m
 # CONFIG_INFINIBAND is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INIT_ENV_ARG_LIMIT=32
@@ -3397,11 +3397,11 @@  CONFIG_WIRELESS_EXT=y
 CONFIG_WLAN=y
 # CONFIG_X25 is not set
 CONFIG_XFRM=y
-CONFIG_XFRM_IPCOMP=y
+CONFIG_XFRM_IPCOMP=m
 # CONFIG_XFRM_MIGRATE is not set
 # CONFIG_XFRM_STATISTICS is not set
 # CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_USER is not set
+CONFIG_XFRM_USER=m
 # CONFIG_XFS_FS is not set
 # CONFIG_XIP_KERNEL is not set
 CONFIG_XPS=y