diff options
| author | Christian Nilsson <christian.c.nilsson@stericsson.com> | 2011-10-21 15:25:02 +0200 |
|---|---|---|
| committer | Jonas ABERG <jonas.aberg@stericsson.com> | 2011-10-24 07:36:40 +0200 |
| commit | 9092d1a0e8112e575596a3676c1f6c8e075fa3b5 (patch) | |
| tree | fd15a91806ae526931c9d058521fb04752a21a5e /arch | |
| parent | fbdd15081578e8e27288f72c208dab334dd7d11f (diff) | |
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 <christian.c.nilsson@stericsson.com>
Tested-by: Christian NILSSON <christian.c.nilsson@stericsson.com>
Reviewed-by: Carl-Johan SALOMONSSON <carl-johan.salomonsson@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'arch')
| -rwxr-xr-x | arch/arm/configs/u8500_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
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 |