diff options
| author | Greg Rose <gvrose8192@gmail.com> | 2018-08-31 10:26:47 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@ovn.org> | 2018-08-31 12:36:17 -0700 |
| commit | e9b33ad780f3bc712a5de6be9e1e0803fadcd249 (patch) | |
| tree | 3f6997655edb3bf1eba480c9ad9a59e82ff732af /datapath | |
| parent | 2235714c653d19e33aee653e2fe7500693fe5935 (diff) | |
| download | openvswitch-e9b33ad780f3bc712a5de6be9e1e0803fadcd249.tar.gz | |
compat: Remove unused function
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.
Signed-off-by: Greg Rose <gvrose8192@gmail.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'datapath')
| -rw-r--r-- | datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h | 21 |
1 files changed, 0 insertions, 21 deletions
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 715e1d510..7834c8c25 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 |