From 401da7b9823136fb7bdb60662ab529c48f01aafc Mon Sep 17 00:00:00 2001 From: Joe Stringer Date: Thu, 7 Jan 2016 17:58:59 -0800 Subject: [PATCH] compat: Detect and use inet_getpeer_v4(). Signed-off-by: Joe Stringer Acked-by: Pravin B Shelar --- acinclude.m4 | 2 ++ datapath/linux/compat/include/net/inetpeer.h | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index dddbd1ca0..eedda7692 100644 --- 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 02e9d440a..c086f3b11 100644 --- a/datapath/linux/compat/include/net/inetpeer.h +++ b/datapath/linux/compat/include/net/inetpeer.h @@ -3,7 +3,8 @@ #include_next -#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) -- 2.20.1