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

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

Merge "defconfig: fsm9900: Move Netfilter/iptables components into modules"

parents 17d62994 becbc9fc

arch/arm/configs/fsm9900-perf_defconfig

+28 −27
Original line number Diff line number Diff line
@@ -106,35 +106,36 @@ CONFIG_INET_IPCOMP=y 
CONFIG_IPV6=y

# CONFIG_NET_ACTIVITY_STATS is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_MARK=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_NF_NAT_IPV6=y

CONFIG_IP6_NF_TARGET_MASQUERADE=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_IP=y

CONFIG_BRIDGE_EBT_IP6=y

CONFIG_BRIDGE_EBT_LIMIT=y

CONFIG_BRIDGE_EBT_PKTTYPE=y

CONFIG_BRIDGE_EBT_VLAN=y

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_NF_NAT_IPV4=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_RAW=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_NF_NAT_IPV6=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m

CONFIG_BRIDGE_EBT_T_NAT=m

CONFIG_BRIDGE_EBT_IP=m

CONFIG_BRIDGE_EBT_IP6=m

CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

arch/arm/configs/fsm9900_defconfig

+28 −27
Original line number Diff line number Diff line
@@ -107,35 +107,36 @@ CONFIG_INET_IPCOMP=y 
CONFIG_IPV6=y

# CONFIG_NET_ACTIVITY_STATS is not set

CONFIG_NETFILTER=y

CONFIG_NF_CONNTRACK=y

CONFIG_NF_CONNTRACK=m

CONFIG_NF_CONNTRACK_MARK=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y

CONFIG_NETFILTER_XTABLES=y

CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m

CONFIG_NETFILTER_XT_MATCH_LIMIT=y

CONFIG_NF_CONNTRACK_IPV4=y

CONFIG_IP_NF_IPTABLES=y

CONFIG_IP_NF_FILTER=y

CONFIG_IP_NF_TARGET_REJECT=y

CONFIG_NF_NAT_IPV4=y

CONFIG_IP_NF_TARGET_MASQUERADE=y

CONFIG_IP_NF_MANGLE=y

CONFIG_IP_NF_RAW=y

CONFIG_NF_CONNTRACK_IPV6=y

CONFIG_IP6_NF_IPTABLES=y

CONFIG_IP6_NF_FILTER=y

CONFIG_IP6_NF_TARGET_REJECT=y

CONFIG_IP6_NF_MANGLE=y

CONFIG_IP6_NF_RAW=y

CONFIG_NF_NAT_IPV6=y

CONFIG_IP6_NF_TARGET_MASQUERADE=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_IP=y

CONFIG_BRIDGE_EBT_IP6=y

CONFIG_BRIDGE_EBT_LIMIT=y

CONFIG_BRIDGE_EBT_PKTTYPE=y

CONFIG_BRIDGE_EBT_VLAN=y

CONFIG_NF_CONNTRACK_IPV4=m

CONFIG_IP_NF_IPTABLES=m

CONFIG_IP_NF_FILTER=m

CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_NF_NAT_IPV4=m

CONFIG_IP_NF_TARGET_MASQUERADE=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_RAW=m

CONFIG_NF_CONNTRACK_IPV6=m

CONFIG_IP6_NF_IPTABLES=m

CONFIG_IP6_NF_FILTER=m

CONFIG_IP6_NF_TARGET_REJECT=m

CONFIG_IP6_NF_MANGLE=m

CONFIG_IP6_NF_RAW=m

CONFIG_NF_NAT_IPV6=m

CONFIG_IP6_NF_TARGET_MASQUERADE=m

CONFIG_BRIDGE_NF_EBTABLES=m

CONFIG_BRIDGE_EBT_BROUTE=m

CONFIG_BRIDGE_EBT_T_FILTER=m

CONFIG_BRIDGE_EBT_T_NAT=m

CONFIG_BRIDGE_EBT_IP=m

CONFIG_BRIDGE_EBT_IP6=m

CONFIG_BRIDGE_EBT_LIMIT=m

CONFIG_BRIDGE_EBT_PKTTYPE=m

CONFIG_BRIDGE_EBT_VLAN=m

CONFIG_BRIDGE=y

CONFIG_VLAN_8021Q=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"