Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 300f51ea authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: config: Enable tethering related configuration on apq8909"

parents 5b414ce5 a1532275

arch/arm/configs/msm8909-perf_defconfig

+15 −1
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -139,13 +141,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -160,6 +166,14 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_BRIDGE_EBT_T_FILTER=y

CONFIG_BRIDGE_EBT_T_NAT=y

CONFIG_BRIDGE_EBT_ARP=y

CONFIG_BRIDGE_EBT_IP=y

CONFIG_BRIDGE_EBT_IP6=y

CONFIG_BRIDGE_EBT_ARPREPLY=y

CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y

arch/arm/configs/msm8909_defconfig

+15 −1
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -144,13 +146,17 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y 
CONFIG_NETFILTER_XT_MATCH_TIME=y

CONFIG_NETFILTER_XT_MATCH_U32=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y

CONFIG_IP_NF_MATCH_TTL=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_IP_NF_NAT=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NATTYPE_MODULE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_IP_NF_SECURITY=y
@@ -165,6 +171,14 @@ CONFIG_IP6_NF_MANGLE=y 
CONFIG_IP6_NF_RAW=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_BRIDGE_EBT_T_FILTER=y

CONFIG_BRIDGE_EBT_T_NAT=y

CONFIG_BRIDGE_EBT_ARP=y

CONFIG_BRIDGE_EBT_IP=y

CONFIG_BRIDGE_EBT_IP6=y

CONFIG_BRIDGE_EBT_ARPREPLY=y

CONFIG_BRIDGE_EBT_DNAT=y

CONFIG_BRIDGE_EBT_SNAT=y

CONFIG_L2TP=y

CONFIG_L2TP_DEBUGFS=y

CONFIG_L2TP_V3=y