From 3fdc3cbde92626c512c27d19be1b58c4323d9359 Mon Sep 17 00:00:00 2001 From: Fei Yang Date: Fri, 18 May 2012 11:41:41 -0700 Subject: [PATCH] VPN: Enable L2TP/IPSec mode BZ: 37071 This patch set the following to enable VPN in L2TP/IPSec mode, CONFIG_L2TP=y CONFIG_NET_KEY=y CONFIG_NET_KEY_MIGRATE=y Change-Id: Ib00717215b646f67ce4539d1b4f8c8533ff671d6 Signed-off-by: Fei Yang Reviewed-on: http://android.intel.com:8080/52370 Reviewed-by: Gross, Mark Tested-by: Ng, Cheon-woei Reviewed-by: buildbot Tested-by: buildbot --- arch/x86/configs/i386_ctp_defconfig | 5 +++-- arch/x86/configs/i386_mfld_defconfig | 5 +++-- arch/x86/configs/i386_mrfl_defconfig | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/arch/x86/configs/i386_ctp_defconfig b/arch/x86/configs/i386_ctp_defconfig index 191cb6d..885b3ee 100644 --- a/arch/x86/configs/i386_ctp_defconfig +++ b/arch/x86/configs/i386_ctp_defconfig @@ -558,7 +558,8 @@ CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y # CONFIG_IP_ADVANCED_ROUTER is not set @@ -748,7 +749,7 @@ CONFIG_IP_NF_MANGLE=y # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_L2TP is not set +CONFIG_L2TP=y # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set diff --git a/arch/x86/configs/i386_mfld_defconfig b/arch/x86/configs/i386_mfld_defconfig index ef58f18..c0ad4e5 100644 --- a/arch/x86/configs/i386_mfld_defconfig +++ b/arch/x86/configs/i386_mfld_defconfig @@ -560,7 +560,8 @@ CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -788,7 +789,7 @@ CONFIG_IP6_NF_RAW=y # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_L2TP is not set +CONFIG_L2TP=y # CONFIG_BRIDGE is not set # CONFIG_VLAN_8021Q is not set # CONFIG_DECNET is not set diff --git a/arch/x86/configs/i386_mrfl_defconfig b/arch/x86/configs/i386_mrfl_defconfig index 305f935..ee0e6be 100644 --- a/arch/x86/configs/i386_mrfl_defconfig +++ b/arch/x86/configs/i386_mrfl_defconfig @@ -568,7 +568,8 @@ CONFIG_XFRM_USER=y CONFIG_XFRM_SUB_POLICY=y CONFIG_XFRM_MIGRATE=y CONFIG_XFRM_STATISTICS=y -# CONFIG_NET_KEY is not set +CONFIG_NET_KEY=y +CONFIG_NET_KEY_MIGRATE=y CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_ADVANCED_ROUTER=y @@ -781,7 +782,7 @@ CONFIG_IP_NF_MANGLE=y # CONFIG_RDS is not set # CONFIG_TIPC is not set # CONFIG_ATM is not set -# CONFIG_L2TP is not set +CONFIG_L2TP=y # CONFIG_BRIDGE is not set # CONFIG_NET_DSA is not set # CONFIG_VLAN_8021Q is not set -- 2.7.4