Pablo Neira Ayuso <pablo@xxxxxxxxxxxxx> wrote: > Would you re-submit this again? This is not showing in my patchwork: > > https://patchwork.ozlabs.org/project/netfilter-devel/list/ > > Please, also include a new subject title and patch description > according to this change. Yon, if you submit this again, would you make these small changes? > > diff --git a/include/linux/netfilter/nf_conntrack_h323_asn1.h b/include/linux/netfilter/nf_conntrack_h323_asn1.h > > index 91d6275292a5..a3844e2cd531 100644 > > --- a/include/linux/netfilter/nf_conntrack_h323_asn1.h > > +++ b/include/linux/netfilter/nf_conntrack_h323_asn1.h > > @@ -1,6 +1,6 @@ > > /* SPDX-License-Identifier: GPL-2.0-only */ > > /**************************************************************************** > > - * ip_conntrack_h323_asn1.h - BER and PER decoding library for H.323 > > + * nf_conntrack_h323_asn1.h - BER and PER decoding library for H.323 > > * conntrack/NAT module. > > * I suggest to drop the file name here, its a self-reference. > > hash = clusterip_hashfn(skb, cipinfo->config); > > diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c > > index f4f9b8344a32..fd7d317951d4 100644 > > --- a/net/netfilter/nf_conntrack_core.c > > +++ b/net/netfilter/nf_conntrack_core.c > > @@ -1817,7 +1817,7 @@ EXPORT_SYMBOL_GPL(nf_ct_kill_acct); > > #include <linux/mutex.h> > > > > /* Generic function for tcp/udp/sctp/dccp and alike. This needs to be > > - * in ip_conntrack_core, since we don't want the protocols to autoload > > + * in nf_conntrack_core, since we don't want the protocols to autoload > > * or depend on ctnetlink */ The protocols are not modular anymore. "Generic function for tcp/udp/sctp/dccp and alike." is enough i think. > > int nf_ct_port_tuple_to_nlattr(struct sk_buff *skb, > > const struct nf_conntrack_tuple *tuple) > > diff --git a/net/netfilter/nf_conntrack_h323_asn1.c b/net/netfilter/nf_conntrack_h323_asn1.c > > index 8f6ba8162f0b..e86b12bd19ed 100644 > > --- a/net/netfilter/nf_conntrack_h323_asn1.c > > +++ b/net/netfilter/nf_conntrack_h323_asn1.c > > @@ -1,11 +1,11 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > /* > > - * ip_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323 > > + * nf_conntrack_helper_h323_asn1.c - BER and PER decoding library for H.323 > > * conntrack/NAT module. > > * I would just drop the name above, as its a self-reference. > > * Copyright (c) 2006 by Jing Min Zhao <zhaojingmin@xxxxxxxxxxxxxxxxxxxxx> > > * > > - * See ip_conntrack_helper_h323_asn1.h for details. > > + * See nf_conntrack_helper_h323_asn1.h for details. This is fine. > > diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c > > --- a/net/netfilter/nf_conntrack_proto_gre.c > > +++ b/net/netfilter/nf_conntrack_proto_gre.c > > @@ -1,6 +1,6 @@ > > // SPDX-License-Identifier: GPL-2.0-only > > /* > > - * ip_conntrack_proto_gre.c - Version 3.0 > > + * nf_conntrack_proto_gre.c - Version 3.0 > > * Consider removing the "ip_conntrack" line completely, version doesn't make sense given this is in mainline kernel. Rest looks good to me.
