From c253c2e3223882160addf0b1d66b64a6398b032d Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Tue, 10 May 2016 09:21:00 +0100 Subject: [PATCH] acinclude.m4: Fix skb_get_hash function detection Commit e2f3178f0582 ("datapath: Add support for kernel 3.14.") added support for 3.14 kernels and a new OVS_GREP_IFELSE check for the "skg_get_hash" function in the process. "skb_get_hash" was introduced in the Linux kernel commit 3958afa1b272 ("net: Change skb_get_rxhash to skb_get_hash") which exists in >=3.14 but the OVS_GREP_IFELSE macro also matches the "skb_get_hash_raw" function which exists in older kernels. As a result of which, the check makes the build system behave as if the "skb_get_hash" function is available in these older kernels leading to build failures. We fix this by explicitly checking for "skb_get_hash(" which matches the function definition. Signed-off-by: Markos Chandras Signed-off-by: Jesse Gross --- acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 23015fef1..f3de85595 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -486,7 +486,8 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_reset_mac_len]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_unclone]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_orphan_frags]) - OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_get_hash]) + OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_get_hash(], + [OVS_DEFINE([HAVE_SKB_GET_HASH])]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [skb_clear_hash]) OVS_GREP_IFELSE([$KSRC/include/linux/skbuff.h], [int.skb_zerocopy(], [OVS_DEFINE([HAVE_SKB_ZEROCOPY])])