diff options
| author | Markos Chandras <mchandras@suse.de> | 2016-05-10 09:21:00 +0100 |
|---|---|---|
| committer | Jesse Gross <jesse@kernel.org> | 2016-05-16 11:33:12 -0700 |
| commit | c253c2e3223882160addf0b1d66b64a6398b032d (patch) | |
| tree | 0a0ccb5ff63edb2190365ea85aebb133fab3db44 /acinclude.m4 | |
| parent | b396293adf1d7ddc43587694ba6f0d1681403fd0 (diff) | |
| download | openvswitch-c253c2e3223882160addf0b1d66b64a6398b032d.tar.gz | |
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 <mchandras@suse.de>
Signed-off-by: Jesse Gross <jesse@kernel.org>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 3 |
1 files changed, 2 insertions, 1 deletions
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])]) |