compat: Detect and use inet_getpeer_v4().

Signed-off-by: Joe Stringer <[email protected]> Acked-by: Pravin B Shelar <[email protected]>
dihao · Feb 2, 2016 · 401da7b · 401da7b
1 parent 1dba169
commit 401da7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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)