| Message ID | 1462236453-27207-1-git-send-email-joe@ovn.org |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, May 2, 2016 at 5:47 PM, Joe Stringer <joe@ovn.org> wrote: > These pieces #if on kernel versions which are not supported since commit > f2ab1536ddbc ("compat: Backport conntrack strictly to v3.10+.") > > Signed-off-by: Joe Stringer <joe@ovn.org> Acked-by: Jesse Gross <jesse@kernel.org>
On 2 May 2016 at 18:22, Jesse Gross <jesse@kernel.org> wrote: > On Mon, May 2, 2016 at 5:47 PM, Joe Stringer <joe@ovn.org> wrote: >> These pieces #if on kernel versions which are not supported since commit >> f2ab1536ddbc ("compat: Backport conntrack strictly to v3.10+.") >> >> Signed-off-by: Joe Stringer <joe@ovn.org> > > Acked-by: Jesse Gross <jesse@kernel.org> Thanks, applied.
diff --git a/acinclude.m4 b/acinclude.m4 index 6cfb1e53ef7f..f2a1ea6ad95f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -375,7 +375,6 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_defrag.*net], [OVS_DEFINE([HAVE_IP_DEFRAG_TAKES_NET])]) OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_do_fragment]) - OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_is_fragment]) OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_skb_dst_mtu]) OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [IPSKB_FRAG_PMTU], diff --git a/datapath/linux/compat/include/net/ip.h b/datapath/linux/compat/include/net/ip.h index 145529ecbbe1..c283ad0a76d2 100644 --- a/datapath/linux/compat/include/net/ip.h +++ b/datapath/linux/compat/include/net/ip.h @@ -6,13 +6,6 @@ #include <net/route.h> #include <linux/version.h> -#ifndef HAVE_IP_IS_FRAGMENT -static inline bool ip_is_fragment(const struct iphdr *iph) -{ - return (iph->frag_off & htons(IP_MF | IP_OFFSET)) != 0; -} -#endif - #ifndef HAVE_INET_GET_LOCAL_PORT_RANGE_USING_NET static inline void rpl_inet_get_local_port_range(struct net *net, int *low, int *high) diff --git a/datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h b/datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h index 09fe78101f3a..c65e7f2feb03 100644 --- a/datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h +++ b/datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h @@ -2,10 +2,7 @@ #define _NF_DEFRAG_IPV6_WRAPPER_H #include <linux/kconfig.h> - -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) #include_next <net/netfilter/ipv6/nf_defrag_ipv6.h> -#endif /* Upstream commit 029f7f3b8701 ("netfilter: ipv6: nf_defrag: avoid/free clone * operations") changed the semantics of nf_ct_frag6_gather(), so we backport
These pieces #if on kernel versions which are not supported since commit f2ab1536ddbc ("compat: Backport conntrack strictly to v3.10+.") Signed-off-by: Joe Stringer <joe@ovn.org> --- acinclude.m4 | 1 - datapath/linux/compat/include/net/ip.h | 7 ------- datapath/linux/compat/include/net/netfilter/ipv6/nf_defrag_ipv6.h | 3 --- 3 files changed, 11 deletions(-)