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

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

Merge "defconfig: sdm855: Enable netfilter socket lookup" into msm-4.14

parents 12dee699 0ec5125a

arch/arm64/configs/sdm855-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -159,12 +159,14 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

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_SOCKET_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y
@@ -183,6 +185,7 @@ CONFIG_IP_NF_ARPTABLES=y 
CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_SOCKET_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_FILTER=y

arch/arm64/configs/sdm855_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -162,12 +162,14 @@ CONFIG_NETFILTER_XT_MATCH_POLICY=y 
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_QUOTA=y

CONFIG_NETFILTER_XT_MATCH_QUOTA2=y

CONFIG_NETFILTER_XT_MATCH_SOCKET=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_NETFILTER_XT_MATCH_STATISTIC=y

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_SOCKET_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_MATCH_AH=y

CONFIG_IP_NF_MATCH_ECN=y
@@ -186,6 +188,7 @@ CONFIG_IP_NF_ARPTABLES=y 
CONFIG_IP_NF_ARPFILTER=y

CONFIG_IP_NF_ARP_MANGLE=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_NF_SOCKET_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_MATCH_RPFILTER=y

CONFIG_IP6_NF_FILTER=y