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

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

Merge "defconfig: mdm: Make bridge_netfilter as loadable module"

parents 6979c15b 886e6671

arch/arm/configs/mdm-perf_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y 
CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -102,7 +101,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=y 
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_IP_SET=y

arch/arm/configs/mdm_defconfig

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y 
CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y
@@ -102,7 +101,7 @@ CONFIG_NETFILTER_XT_MATCH_IPRANGE=y 
# CONFIG_NETFILTER_XT_MATCH_L2TP is not set

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NETFILTER_XT_MATCH_MULTIPORT=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=y

CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m

CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y

CONFIG_NETFILTER_XT_MATCH_STATE=y

CONFIG_IP_SET=y

arch/arm/configs/sdx-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y 
CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y

arch/arm/configs/sdx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y 
CONFIG_IPV6_PIMSM_V2=y

CONFIG_NETFILTER=y

CONFIG_NETFILTER_DEBUG=y

CONFIG_BRIDGE_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK_EVENTS=y

CONFIG_NF_CONNTRACK_TIMEOUT=y