summaryrefslogtreecommitdiffstats
path: root/include/net
diff options
context:
space:
mode:
authorGao Feng <fgao@ikuai8.com>2017-04-04 21:57:04 -0400
committerPablo Neira Ayuso <pablo@netfilter.org>2017-04-08 18:08:22 -0400
commit4f139972b489f8bc2c821aa25ac65018d92af3f7 (patch)
treeff4a9288b64b8eab5ba755f9ce956a55f7ed8216 /include/net
parent1e038e3eef7d68dcdae4abfb5da7f2dff4becb63 (diff)
netfilter: udplite: Remove duplicated udplite4/6 declaration
There are two nf_conntrack_l4proto_udp4 declarations in the head file nf_conntrack_ipv4/6.h. Now remove one which is not enbraced by the macro CONFIG_NF_CT_PROTO_UDPLITE. Signed-off-by: Gao Feng <fgao@ikuai8.com>
Diffstat (limited to 'include/net')
-rw-r--r--include/net/netfilter/ipv4/nf_conntrack_ipv4.h1
-rw-r--r--include/net/netfilter/ipv6/nf_conntrack_ipv6.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
index 6ff32815641b..919e4e8af327 100644
--- a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
+++ b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
@@ -14,7 +14,6 @@ extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4;
14 14
15extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4; 15extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp4;
16extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4; 16extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
17extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4;
18extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp; 17extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
19#ifdef CONFIG_NF_CT_PROTO_DCCP 18#ifdef CONFIG_NF_CT_PROTO_DCCP
20extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4; 19extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4;
diff --git a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
index c59b82456f89..eaea968f8657 100644
--- a/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
+++ b/include/net/netfilter/ipv6/nf_conntrack_ipv6.h
@@ -5,7 +5,6 @@ extern struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv6;
5 5
6extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6; 6extern struct nf_conntrack_l4proto nf_conntrack_l4proto_tcp6;
7extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6; 7extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp6;
8extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite6;
9extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6; 8extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmpv6;
10#ifdef CONFIG_NF_CT_PROTO_DCCP 9#ifdef CONFIG_NF_CT_PROTO_DCCP
11extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6; 10extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp6;