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

[Tyler Hicks]

Sync with the traditional Ubuntu kernel config options in regards to
ipsec options.

Signed-off-by: Tyler Hicks <tyhicks at canonical.com>
---
 debian.goldfish/config/armhf/config.common.armhf |  1 -
 debian.goldfish/config/config.common.ubuntu      | 19 ++++++++++---------
 debian.goldfish/config/i386/config.common.i386   |  1 -
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian.goldfish/config/armhf/config.common.armhf b/debian.goldfish/config/armhf/config.common.armhf
index c610287..12332d2 100644
--- a/debian.goldfish/config/armhf/config.common.armhf
+++ b/debian.goldfish/config/armhf/config.common.armhf
@@ -94,7 +94,6 @@ CONFIG_INPUT_MOUSEDEV_PSAUX=y
 CONFIG_INPUT_POLLDEV=m
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_NF_TARGET_ULOG=m
 # CONFIG_IP_PNP_RARP is not set
 # CONFIG_ISO9660_FS is not set
diff --git a/debian.goldfish/config/config.common.ubuntu b/debian.goldfish/config/config.common.ubuntu
index 725aa3d..ab2d1e9 100644
--- a/debian.goldfish/config/config.common.ubuntu
+++ b/debian.goldfish/config/config.common.ubuntu
@@ -1262,15 +1262,15 @@ CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_INET6_XFRM_MODE_TRANSPORT=m
 CONFIG_INET6_XFRM_MODE_TUNNEL=m
 CONFIG_INET6_XFRM_TUNNEL=m
-# CONFIG_INET_AH is not set
+CONFIG_INET_AH=m
 # CONFIG_INET_DIAG is not set
-CONFIG_INET_ESP=y
-# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_ESP=m
+CONFIG_INET_IPCOMP=m
 CONFIG_INET_TUNNEL=m
-# 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_INFTL is not set
 CONFIG_INITRAMFS_SOURCE=""
@@ -1413,6 +1413,7 @@ CONFIG_IPV6_TUNNEL=m
 # CONFIG_IPW2200 is not set
 # CONFIG_IPWIRELESS is not set
 # CONFIG_IPX is not set
+CONFIG_IP_ADVANCED_ROUTER=y
 # CONFIG_IP_DCCP is not set
 CONFIG_IP_FIB_TRIE_STATS=y
 CONFIG_IP_MROUTE=y
@@ -1936,7 +1937,7 @@ CONFIG_NETFILTER_XT_MATCH_NFACCT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y
-CONFIG_NETFILTER_XT_MATCH_POLICY=y
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=y
 CONFIG_NETFILTER_XT_MATCH_QUOTA2=y
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@@ -1990,7 +1991,7 @@ CONFIG_NET_DMA=y
 # CONFIG_NET_IPGRE is not set
 CONFIG_NET_IPGRE_DEMUX=m
 # CONFIG_NET_IPIP is not set
-CONFIG_NET_KEY=y
+CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
 CONFIG_NET_NS=y
 CONFIG_NET_PACKET_ENGINE=y
diff --git a/debian.goldfish/config/i386/config.common.i386 b/debian.goldfish/config/i386/config.common.i386
index b87cb8a..11f5c13 100644
--- a/debian.goldfish/config/i386/config.common.i386
+++ b/debian.goldfish/config/i386/config.common.i386
@@ -94,7 +94,6 @@ CONFIG_INPUT_JOYSTICK=y
 CONFIG_INPUT_POLLDEV=y
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_IP_ADVANCED_ROUTER=y
 CONFIG_IP_NF_TARGET_ULOG=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_ISO9660_FS=y
-- 
1.9.1