diff mbox series

[ovs-dev,branch-2.10] compat: Remove unused function

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

Commit Message

Simon Horman Oct. 25, 2019, 10:13 a.m. UTC 
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.

A backport of this patch to branch-2.10 seems to be required
to fix build errors when compiling against v3.16.54

  before: https://travis-ci.org/openvswitch/ovs/builds/602518689
  after: https://travis-ci.org/horms2/ovs/builds/602665800

Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Signed-off-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: John Hurley <john.hurley@netronome.com>
---
 .../include/net/netfilter/nf_conntrack_core.h | 21 -------------------
 1 file changed, 21 deletions(-)

Comments

0-day Robot Oct. 25, 2019, 10:59 a.m. UTC | #1 
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
Ben Pfaff Oct. 25, 2019, 5:59 p.m. UTC | #2 
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.
Simon Horman Oct. 26, 2019, 7:17 a.m. UTC | #3 
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 mbox series

Patch

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