compat: Detect and use inet_getpeer_v4().

Signed-off-by: Joe Stringer <joe@ovn.org>
Acked-by: Pravin B Shelar <pshelar@ovn.org>

diff --git a/acinclude.m4 b/acinclude.m4
index dddbd1c..eedda76 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -359,6 +359,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
                         [frags_work])
   OVS_FIND_FIELD_IFELSE([$KSRC/include/net/inet_frag.h], [inet_frags],
                         [rwlock])
+  OVS_GREP_IFELSE([$KSRC/include/net/inetpeer.h], [vif],
+                  [OVS_DEFINE([HAVE_INETPEER_VIF_SUPPORT])])
 
   OVS_GREP_IFELSE([$KSRC/include/net/dst_metadata.h], [metadata_dst])
 

diff --git a/datapath/linux/compat/include/net/inetpeer.h b/datapath/linux/compat/include/net/inetpeer.h
index 02e9d44..c086f3b 100644 (file)
--- a/datapath/linux/compat/include/net/inetpeer.h
+++ b/datapath/linux/compat/include/net/inetpeer.h
@@ -3,7 +3,8 @@
 
 #include_next <net/inetpeer.h>
 
-#ifdef OVS_FRAGMENT_BACKPORT
+#if defined(OVS_FRAGMENT_BACKPORT) && \
+    !defined(HAVE_INETPEER_VIF_SUPPORT)
 static inline struct inet_peer *rpl_inet_getpeer_v4(struct inet_peer_base *base,
                                                    __be32 v4daddr, int vif,
                                                    int create)