aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-06-05 10:12:51 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-06-05 10:12:51 +0000
commitbafd98a883e6ff54bd1be087c848f876fdc6fcf8 (patch)
tree517704e153de23cdeed6d0dbd1a8e532e9ae59bd /include
parentf0fc8f5100ff606038a185766df3256eaf501f0f (diff)
downloadupstream-bafd98a883e6ff54bd1be087c848f876fdc6fcf8.tar.gz
upstream-bafd98a883e6ff54bd1be087c848f876fdc6fcf8.tar.bz2
upstream-bafd98a883e6ff54bd1be087c848f876fdc6fcf8.zip
AA: iptables: backport r35898 (#13649)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36853 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
-rw-r--r--include/netfilter.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk
index e42b50584b..644e16cb9b 100644
--- a/include/netfilter.mk
+++ b/include/netfilter.mk
@@ -138,6 +138,8 @@ $(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MANGLE, $(P_V6)ip6ta
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),))
$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),))
+$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6)))
+
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah))
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_EUI64, $(P_V6)ip6t_eui64))
$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_FRAG, $(P_V6)ip6t_frag))
@@ -269,7 +271,7 @@ IPT_BUILTIN += $(IPT_FILTER-y)
IPT_BUILTIN += $(IPT_IPOPT-y)
IPT_BUILTIN += $(IPT_IPRANGE-y)
IPT_BUILTIN += $(IPT_IPSEC-y)
-IPT_BUILTIN += $(IPT_IPV6-y)
+IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m)
IPT_BUILTIN += $(IPT_NAT-y)
IPT_BUILTIN += $(IPT_NAT_EXTRA-y)
IPT_BUILTIN += $(IPT_NATHELPER-y)