summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Grape <markus.grape@stericsson.com>2012-01-24 16:04:43 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:01:34 +0200
commitfd13fc6db0451ec7dc777e8759fc452f0a7b4373 (patch)
tree173562ff69c466f05b721a83b12a25e55996c493
parent4e321b9cdfec86b9693b92d33f3c8cb339927d03 (diff)
net: add support for datausage
This will add support for datausage that is located in the google Settings application. ST-Ericsson Linux next: NA ST-Ericsson ID: 350337 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: Ie824b09788c09ec6723f6f6af22ffef8ab0b3d2c Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/46415 Tested-by: Markus GRAPE <markus.grape@stericsson.com> Reviewed-by: QATEST Reviewed-by: Hakan GARDRUP <hakan.gardrup@stericsson.com> Reviewed-by: Anders NILSSON2 <anders.o.nilsson@stericsson.com> Reviewed-by: Rabin VINCENT <rabin.vincent@stericsson.com>
-rwxr-xr-xarch/arm/configs/u8500_defconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 7aca5c32ee6..5be43983501 100755
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -68,6 +68,8 @@ CONFIG_IP_PNP=y
CONFIG_IP_PNP_DHCP=y
# CONFIG_INET_LRO is not set
CONFIG_IPV6=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP6_NF_IPTABLES=y
# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set
# CONFIG_INET6_XFRM_MODE_TUNNEL is not set
# CONFIG_INET6_XFRM_MODE_BEET is not set
@@ -81,6 +83,9 @@ CONFIG_NF_CONNTRACK_FTP=y
CONFIG_NF_CT_NETLINK=y
CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y
CONFIG_NETFILTER_XT_MATCH_STATE=y
+CONFIG_NETFILTER_XT_MATCH_QTAGUID=y
+CONFIG_NETFILTER_XT_MATCH_SOCKET=y
+CONFIG_NETFILTER_TPROXY=y
CONFIG_NF_CONNTRACK_IPV4=y
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP_NF_FILTER=y