* [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated udplite4 declaration
@ 2017-04-05 1:23 gfree.wind
2017-04-05 1:58 ` Gao Feng
0 siblings, 1 reply; 2+ messages in thread
From: gfree.wind @ 2017-04-05 1:23 UTC (permalink / raw)
To: pablo, netfilter-devel; +Cc: Gao Feng
From: Gao Feng <fgao@ikuai8.com>
There are two nf_conntrack_l4proto_udp4 declarations in the head file
nf_conntrack_ipv4.h. Now remove one which is not enbraced by the macro
CONFIG_NF_CT_PROTO_UDPLITE.
Signed-off-by: Gao Feng <fgao@ikuai8.com>
---
include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
index 6ff3281..919e4e8 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_l4proto nf_conntrack_l4proto_tcp4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4;
-extern struct nf_conntrack_l4proto nf_conntrack_l4proto_udplite4;
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_icmp;
#ifdef CONFIG_NF_CT_PROTO_DCCP
extern struct nf_conntrack_l4proto nf_conntrack_l4proto_dccp4;
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* RE: [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated udplite4 declaration
2017-04-05 1:23 [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated udplite4 declaration gfree.wind
@ 2017-04-05 1:58 ` Gao Feng
0 siblings, 0 replies; 2+ messages in thread
From: Gao Feng @ 2017-04-05 1:58 UTC (permalink / raw)
To: gfree.wind, pablo, netfilter-devel
Hi,
> -----Original Message-----
> From: gfree.wind@foxmail.com [mailto:gfree.wind@foxmail.com]
> Sent: Wednesday, April 5, 2017 9:23 AM
> To: pablo@netfilter.org; netfilter-devel@vger.kernel.org
> Cc: Gao Feng <fgao@ikuai8.com>
> Subject: [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated
udplite4
> declaration
>
> From: Gao Feng <fgao@ikuai8.com>
>
> There are two nf_conntrack_l4proto_udp4 declarations in the head file
> nf_conntrack_ipv4.h. Now remove one which is not enbraced by the macro
> CONFIG_NF_CT_PROTO_UDPLITE.
>
> Signed-off-by: Gao Feng <fgao@ikuai8.com>
> ---
> include/net/netfilter/ipv4/nf_conntrack_ipv4.h | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
> b/include/net/netfilter/ipv4/nf_conntrack_ipv4.h
> index 6ff3281..919e4e8 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_l4proto nf_conntrack_l4proto_tcp4; extern
> struct nf_conntrack_l4proto nf_conntrack_l4proto_udp4; -extern struct
> nf_conntrack_l4proto nf_conntrack_l4proto_udplite4; extern struct
> nf_conntrack_l4proto nf_conntrack_l4proto_icmp; #ifdef
> CONFIG_NF_CT_PROTO_DCCP extern struct nf_conntrack_l4proto
> nf_conntrack_l4proto_dccp4;
> --
> 1.9.1
>
Sorry, please ignore this patch.
Because I find there is another duplicated declaration in IPv6 codes.
So I have sent v2 patch already.
Regards
Feng
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-05 1:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-04-05 1:23 [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated udplite4 declaration gfree.wind
2017-04-05 1:58 ` Gao Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).