X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=acinclude.m4;h=11c77877d46ce0f5cc893eca47b22aeb79257863;hb=fa12812602aecea6ea19561f9e00ccf5a201e82f;hp=e99420e5f7a82228bd2e6a1f52ea6287caf68faa;hpb=e0d45da35ec70f2224826a5a62ce66e505ee1962;p=cascardo%2Fovs.git

diff --git a/acinclude.m4 b/acinclude.m4
index e99420e5f..11c77877d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -351,6 +351,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
   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],
+                  [OVS_DEFINE([HAVE_CORRECT_MRU_HANDLING])])
+  OVS_GREP_IFELSE([$KSRC/include/net/ip_tunnels.h], [__ip_tunnel_change_mtu])
   OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h], [hashfn.*const],
                   [OVS_DEFINE([HAVE_INET_FRAGS_CONST])])
   OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h], [last_in],
@@ -548,7 +552,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])