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

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

Merge "defconfig: Enabling tethering on APQ8084"

parents 97c18eda 2a90db3f

arch/arm/configs/apq8084-perf_defconfig

+16 −2
Original line number Diff line number Diff line
@@ -112,14 +112,15 @@ CONFIG_UNIX=y 
CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET_AH=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -134,6 +135,8 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -149,6 +152,7 @@ CONFIG_NF_CONNTRACK_PPTP=y 
CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NF_NAT_IPV4=y

CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
@@ -202,6 +206,9 @@ CONFIG_IP_NF_SECURITY=y 
CONFIG_IP_NF_ARPTABLES=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y
@@ -540,3 +547,10 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_BRIDGE=y

arch/arm/configs/apq8084_defconfig

+16 −2
Original line number Diff line number Diff line
@@ -114,14 +114,15 @@ CONFIG_UNIX=y 
CONFIG_XFRM_USER=y

CONFIG_NET_KEY=y

CONFIG_INET=y

CONFIG_INET_AH=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_IP_PNP=y

CONFIG_IP_PNP_DHCP=y

CONFIG_INET_ESP=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

CONFIG_INET_XFRM_MODE_TRANSPORT=y

CONFIG_INET_XFRM_MODE_TUNNEL=y

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_LRO is not set

CONFIG_IPV6=y
@@ -136,6 +137,8 @@ CONFIG_IPV6_MIP6=y 
CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_IPV6_SUBTREES=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_XT_TARGET_NOTRACK=y

CONFIG_NETFILTER_XT_MATCH_DSCP=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_SECMARK=y

CONFIG_NF_CONNTRACK_EVENTS=y
@@ -151,6 +154,7 @@ CONFIG_NF_CONNTRACK_PPTP=y 
CONFIG_NF_CONNTRACK_SANE=y

CONFIG_NF_CONNTRACK_TFTP=y

CONFIG_NF_CT_NETLINK=y

CONFIG_NF_NAT_IPV4=y

CONFIG_NETFILTER_TPROXY=y

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y

CONFIG_NETFILTER_XT_TARGET_CONNMARK=y
@@ -204,6 +208,9 @@ CONFIG_IP_NF_SECURITY=y 
CONFIG_IP_NF_ARPTABLES=y

CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_TARGET_NETMAP=y

CONFIG_IP_NF_TARGET_REDIRECT=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y
@@ -588,3 +595,10 @@ CONFIG_CRYPTO_TWOFISH=y 
CONFIG_CRYPTO_DEV_QCRYPTO=m

CONFIG_CRYPTO_DEV_QCE=y

CONFIG_CRYPTO_DEV_QCEDEV=y

CONFIG_CRYPTO_NULL=y

CONFIG_CRYPTO_ECB=y

CONFIG_CRYPTO_XCBC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_BRIDGE_NF_EBTABLES=y

CONFIG_BRIDGE_EBT_BROUTE=y

CONFIG_BRIDGE=y