Hi, > -----Original Message----- > From: gfree.wind@xxxxxxxxxxx [mailto:gfree.wind@xxxxxxxxxxx] > Sent: Wednesday, April 5, 2017 9:23 AM > To: pablo@xxxxxxxxxxxxx; netfilter-devel@xxxxxxxxxxxxxxx > Cc: Gao Feng <fgao@xxxxxxxxxx> > Subject: [PATCH nf-next 1/1] netfilter: udplite4: Remove duplicated udplite4 > declaration > > From: Gao Feng <fgao@xxxxxxxxxx> > > 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@xxxxxxxxxx> > --- > 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 -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
