From: Joe Stringer Date: Thu, 24 Dec 2015 21:09:38 +0000 (-0800) Subject: datapath: Re-designate OVS_FRAGMENT_BACKPORT. X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=f5284933c877b3734daa08c707560628078c5feb datapath: Re-designate OVS_FRAGMENT_BACKPORT. Typically the way that we include backported code is by testing for existence of the feature in the upstream codebase via header checks, then attempt to use the upstream code as much as possible. However, for the IP fragmentation handling backport we have an additional constraint which is that we cannot support kernels older than Linux-3.10. To date, OVS_FRAGMENT_BACKPORT has been defined to include the backport of the IP fragmentation code for all kernels from 3.10 to 4.2, rather than attempting to use the upstream code as much as possible. This patch relaxes OVS_FRAGMENT_BACKPORT to only check the lower bound so that the upstream code may be used in more circumstances. Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar --- diff --git a/acinclude.m4 b/acinclude.m4 index 93fab5d1f..dc06be632 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -551,7 +551,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/utsrelease.h], [el6], [OVS_DEFINE([HAVE_RHEL6_PER_CPU])]) - if test "$version" = 4 && test "$patchlevel" -le 2; then + dnl Conntrack support, and therefore, IP fragment handling backport, should + dnl only be enabled on kernels 3.10+. In future when OVS drops support for + dnl kernels older than 3.10, this macro could be removed from the codebase. + if test "$version" = 4; then OVS_DEFINE([OVS_FRAGMENT_BACKPORT]) elif test "$version" = 3 && test "$patchlevel" -ge 10; then OVS_DEFINE([OVS_FRAGMENT_BACKPORT])