From 9092d1a0e8112e575596a3676c1f6c8e075fa3b5 Mon Sep 17 00:00:00 2001 From: Christian Nilsson Date: Fri, 21 Oct 2011 15:25:02 +0200 Subject: u8500_defconfig: Add support for active FTP in NAP Allowing active ftp to work when running NAP by adding support in conntrack and nat for it. ST-Ericsson ID: 364593 ST-Ericsson FOSS-OUT ID: NA Change-Id: I1f17ab1ccdef0db7d9a82a60fec686abbf6c2d5f Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34953 Reviewed-by: Christian NILSSON Tested-by: Christian NILSSON Reviewed-by: Carl-Johan SALOMONSSON Reviewed-by: Jonas ABERG --- arch/arm/configs/u8500_defconfig | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig index 2934c2889f1..c0180ad2abf 100755 --- a/arch/arm/configs/u8500_defconfig +++ b/arch/arm/configs/u8500_defconfig @@ -106,6 +106,8 @@ CONFIG_NF_CONNTRACK_IPV4=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_ULOG=y +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_NAT_FTP=y CONFIG_NF_NAT=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_PHONET=y -- cgit v1.2.3