From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- target/linux/config/Config.in.netfilter.ip6 | 38 ++++++++++++++--------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'target/linux/config/Config.in.netfilter.ip6') diff --git a/target/linux/config/Config.in.netfilter.ip6 b/target/linux/config/Config.in.netfilter.ip6 index 2138354eb..33588a071 100644 --- a/target/linux/config/Config.in.netfilter.ip6 +++ b/target/linux/config/Config.in.netfilter.ip6 @@ -1,7 +1,7 @@ -config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV6 +config ADK_KERNEL_NF_CONNTRACK_IPV6 tristate "IPv6 connection tracking support" - select ADK_KPACKAGE_KMOD_NF_CONNTRACK - select ADK_KPACKAGE_KMOD_IPV6 + select ADK_KERNEL_NF_CONNTRACK + select ADK_KERNEL_IPV6 ---help--- Connection tracking keeps a record of what packets have passed through your machine, in order to figure out how they are related @@ -13,10 +13,10 @@ config ADK_KPACKAGE_KMOD_NF_CONNTRACK_IPV6 To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +config ADK_KERNEL_IP6_NF_IPTABLES tristate "IP6 tables support (required for filtering)" select ADK_KERNEL_NETFILTER_XTABLES - select ADK_KPACKAGE_KMOD_IPV6 + select ADK_KERNEL_IPV6 help ip6tables is a general, extensible packet identification framework. Currently only the packet filtering and packet mangling subsystem @@ -25,17 +25,17 @@ config ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES To compile it as a module, choose M here. If unsure, say N. -if ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +if ADK_KERNEL_IP6_NF_IPTABLES # The simple matches. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_AH +config ADK_KERNEL_IP6_NF_MATCH_AH tristate '"ah" match support' help This module allows one to match AH packets. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_EUI64 +config ADK_KERNEL_IP6_NF_MATCH_EUI64 tristate '"eui64" address check' help This module performs checking on the IPv6 source address @@ -44,7 +44,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_EUI64 To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_FRAG +config ADK_KERNEL_IP6_NF_MATCH_FRAG tristate '"frag" Fragmentation header match support' help frag matching allows you to match packets based on the fragmentation @@ -52,7 +52,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_FRAG To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_OPTS +config ADK_KERNEL_IP6_NF_MATCH_OPTS tristate '"hbh" hop-by-hop and "dst" opts header match support' help This allows one to match packets based on the hop-by-hop @@ -60,7 +60,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_OPTS To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_IPV6HEADER +config ADK_KERNEL_IP6_NF_MATCH_IPV6HEADER tristate '"ipv6header" IPv6 Extension Headers Match' help This module allows one to match packets based upon @@ -68,14 +68,14 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_IPV6HEADER To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_MH +config ADK_KERNEL_IP6_NF_MATCH_MH tristate '"mh" match support' help This module allows one to match MH packets. To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT +config ADK_KERNEL_IP6_NF_MATCH_RT tristate '"rt" Routing header match support' help rt matching allows you to match packets based on the routing @@ -85,7 +85,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MATCH_RT # The targets -config ADK_KPACKAGE_KMOD_IP6_NF_FILTER +config ADK_KERNEL_IP6_NF_FILTER tristate "Packet filtering" help Packet filtering defines a table `filter', which has a series of @@ -94,9 +94,9 @@ config ADK_KPACKAGE_KMOD_IP6_NF_FILTER To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_REJECT +config ADK_KERNEL_IP6_NF_TARGET_REJECT tristate "REJECT target support" - depends on ADK_KPACKAGE_KMOD_IP6_NF_FILTER + depends on ADK_KERNEL_IP6_NF_FILTER help The REJECT target allows a filtering rule to specify that an ICMPv6 error should be issued in response to an incoming packet, rather @@ -104,7 +104,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_TARGET_REJECT To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_MANGLE +config ADK_KERNEL_IP6_NF_MANGLE tristate "Packet mangling" help This option adds a `mangle' table to iptables: see the man page for @@ -113,7 +113,7 @@ config ADK_KPACKAGE_KMOD_IP6_NF_MANGLE To compile it as a module, choose M here. If unsure, say N. -config ADK_KPACKAGE_KMOD_IP6_NF_RAW +config ADK_KERNEL_IP6_NF_RAW tristate 'raw table support (required for TRACE)' help This option adds a `raw' table to ip6tables. This table is the very @@ -123,4 +123,4 @@ config ADK_KPACKAGE_KMOD_IP6_NF_RAW If you want to compile it as a module, say M here and read . If unsure, say `N'. -endif # ADK_KPACKAGE_KMOD_IP6_NF_IPTABLES +endif # ADK_KERNEL_IP6_NF_IPTABLES -- cgit v1.2.3