diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2016-05-11 22:03:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-11 22:03:11 +0000 |
| commit | 57c01cb1500ea76b66c50504e7f2c7b1e5ce68ab (patch) | |
| tree | 7d7e3fa77be7dee4666cc9eff7ec1b79de4ac48e | |
| parent | a92eb547868a5d0dd631a9ed215373d5793bdade (diff) | |
| parent | 4a74e41631546a0e74cbedb4c0d87d1e6a70db28 (diff) | |
Merge "hikey_defconfig: Enable CONFIG_IPV6_SIT and CONFIG_IP6_NF_MATCH_XXX" into android-hikey-linaro-4.4
| -rw-r--r-- | arch/arm64/configs/hikey_defconfig | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm64/configs/hikey_defconfig b/arch/arm64/configs/hikey_defconfig index b345302c08f1..5313df57f121 100644 --- a/arch/arm64/configs/hikey_defconfig +++ b/arch/arm64/configs/hikey_defconfig @@ -89,7 +89,6 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=y CONFIG_IPV6_MIP6=y -# CONFIG_IPV6_SIT is not set CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_NETLABEL=y CONFIG_NETFILTER=y @@ -158,6 +157,13 @@ CONFIG_IP_NF_ARPFILTER=y CONFIG_IP_NF_ARP_MANGLE=y CONFIG_NF_CONNTRACK_IPV6=y CONFIG_IP6_NF_IPTABLES=y +CONFIG_IP6_NF_MATCH_AH=y +CONFIG_IP6_NF_MATCH_EUI64=y +CONFIG_IP6_NF_MATCH_FRAG=y +CONFIG_IP6_NF_MATCH_OPTS=y +CONFIG_IP6_NF_MATCH_HL=y +CONFIG_IP6_NF_MATCH_IPV6HEADER=y +CONFIG_IP6_NF_MATCH_MH=y CONFIG_IP6_NF_FILTER=y CONFIG_IP6_NF_TARGET_REJECT=y CONFIG_IP6_NF_MANGLE=y |