Message ID | 20191025101336.28217-1-simon.horman@netronome.com |
---|---|
State | Accepted |
Commit | 590656ae952b5cbc8d5746a08045bd1ff3ffb09b |
Headers | show |
Series | [ovs-dev,branch-2.10] compat: Remove unused function | expand |
Bleep bloop. Greetings Simon Horman, I am a robot and I have tried out your patch. Thanks for your contribution. I encountered some error that I wasn't expecting. See the details below. checkpatch: WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Ben Pfaff <blp@ovn.org>, Simon Horman <simon.horman@netronome.com> Lines checked: 63, Warnings: 1, Errors: 0 Please check this out. If you feel there has been an error, please email aconole@redhat.com Thanks, 0-day Robot
On Fri, Oct 25, 2019 at 12:13:36PM +0200, Simon Horman wrote: > From: Greg Rose <gvrose8192@gmail.com> > > The compat function rpl_nf_conntrack_in() does not appear to be used > anywhere and emits warnings as such during builds < 4.10. > > The patch passes Travis: > > https://travis-ci.org/gvrose8192/ovs-experimental/builds/423097292 > > Remove it. Thanks for the backport. I applied this to branch-2.10.
On Fri, Oct 25, 2019 at 10:59:58AM -0700, Ben Pfaff wrote: > On Fri, Oct 25, 2019 at 12:13:36PM +0200, Simon Horman wrote: > > From: Greg Rose <gvrose8192@gmail.com> > > > > The compat function rpl_nf_conntrack_in() does not appear to be used > > anywhere and emits warnings as such during builds < 4.10. > > > > The patch passes Travis: > > > > https://travis-ci.org/gvrose8192/ovs-experimental/builds/423097292 > > > > Remove it. > > Thanks for the backport. I applied this to branch-2.10. Thanks, much appreciated.
diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h index cd55843c3605..10158011fd4d 100644 --- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h +++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h @@ -67,27 +67,6 @@ static inline bool rpl_nf_ct_get_tuple(const struct sk_buff *skb, #define nf_ct_get_tuple rpl_nf_ct_get_tuple #endif /* HAVE_NF_CT_GET_TUPLEPR_TAKES_STRUCT_NET */ -/* Commit 08733a0cb7de ("netfilter: handle NF_REPEAT from nf_conntrack_in()") - * introduced behavioural changes to this function which cannot be detected - * in the headers. Unconditionally backport to kernels older than the one which - * contains this commit. */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(4,10,0) -static unsigned int rpl_nf_conntrack_in(struct net *net, u_int8_t pf, - unsigned int hooknum, - struct sk_buff *skb) -{ - int err; - - /* Repeat if requested, see nf_iterate(). */ - do { - err = nf_conntrack_in(net, pf, hooknum, skb); - } while (err == NF_REPEAT); - - return err; -} -#define nf_conntrack_in rpl_nf_conntrack_in -#endif /* < 4.10 */ - #ifdef HAVE_NF_CONN_TIMER #ifndef HAVE_NF_CT_DELETE