diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-01-13 18:38:49 +0100 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-01-23 13:27:10 +0100 |
| commit | 6f78f7f50194b75e8af4d682eef6cd94ca4767cf (patch) | |
| tree | 4a107474848ed37a978f74c26ae8a23dcae00ce0 | |
| parent | edc26f7b1641f1947a6a7984bb022b0462b629ae (diff) | |
defconfig: merge los13 -> los14 changes
| -rw-r--r-- | arch/arm64/configs/los14_m2note_defconfig | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/arch/arm64/configs/los14_m2note_defconfig b/arch/arm64/configs/los14_m2note_defconfig index 99aaf16a6..6858c3709 100644 --- a/arch/arm64/configs/los14_m2note_defconfig +++ b/arch/arm64/configs/los14_m2note_defconfig @@ -664,13 +664,13 @@ CONFIG_NF_DEFRAG_IPV4=y CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_IP_NF_IPTABLES=y -# CONFIG_IP_NF_MATCH_AH is not set -# CONFIG_IP_NF_MATCH_ECN is not set +CONFIG_IP_NF_MATCH_AH=y +CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_RPFILTER=y -# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y -# CONFIG_IP_NF_TARGET_REJECT_SKERR is not set +CONFIG_IP_NF_TARGET_REJECT_SKERR=y # CONFIG_IP_NF_TARGET_ULOG is not set CONFIG_NF_NAT_IPV4=y CONFIG_IP_NF_TARGET_MASQUERADE=y @@ -712,7 +712,8 @@ CONFIG_IP6_NF_MANGLE=y CONFIG_IP6_NF_RAW=y # CONFIG_IP6_NF_SECURITY is not set # CONFIG_NF_NAT_IPV6 is not set -# CONFIG_BRIDGE_NF_EBTABLES is not set +CONFIG_BRIDGE_NF_EBTABLES=y +CONFIG_BRIDGE_EBT_BROUTE=y # CONFIG_IP_DCCP is not set # CONFIG_IP_SCTP is not set # CONFIG_RDS is not set @@ -746,7 +747,7 @@ CONFIG_NET_SCHED=y # CONFIG_NET_SCH_CBQ is not set CONFIG_NET_SCH_HTB=y # CONFIG_NET_SCH_HFSC is not set -# CONFIG_NET_SCH_PRIO is not set +CONFIG_NET_SCH_PRIO=y # CONFIG_NET_SCH_MULTIQ is not set # CONFIG_NET_SCH_RED is not set # CONFIG_NET_SCH_SFB is not set @@ -783,7 +784,12 @@ CONFIG_CLS_U32_MARK=y # CONFIG_NET_CLS_RSVP6 is not set CONFIG_NET_CLS_FLOW=y # CONFIG_NET_CLS_CGROUP is not set -# CONFIG_NET_EMATCH is not set +CONFIG_NET_EMATCH=y +CONFIG_NET_EMATCH_CMP=y +CONFIG_NET_EMATCH_NBYTE=y +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y +CONFIG_NET_EMATCH_TEXT=y CONFIG_NET_CLS_ACT=y CONFIG_NET_ACT_POLICE=y # CONFIG_NET_ACT_GACT is not set |