From patchwork Tue May 10 07:46:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markos Chandras X-Patchwork-Id: 620493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (archives.nicira.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 3r3rtT2974z9t3n for ; Tue, 10 May 2016 17:46:56 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B68CB106C2; Tue, 10 May 2016 00:46:55 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 12A6E10670 for ; Tue, 10 May 2016 00:46:54 -0700 (PDT) Received: from bar5.cudamail.com (localhost [127.0.0.1]) by mx1e3.cudamail.com (Postfix) with ESMTPS id 67069420327 for ; Tue, 10 May 2016 01:46:53 -0600 (MDT) X-ASG-Debug-ID: 1462866412-09eadd4da8450da0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id TbDyF1jQUWAJ3ycg (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Tue, 10 May 2016 01:46:52 -0600 (MDT) X-Barracuda-Envelope-From: mchandras@suse.de X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mx2.suse.de) (195.135.220.15) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 10 May 2016 07:46:52 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at suse.de designates 195.135.220.15 as permitted sender) X-Barracuda-Apparent-Source-IP: 195.135.220.15 X-Barracuda-RBL-IP: 195.135.220.15 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 53F38AAF1 for ; Tue, 10 May 2016 07:46:49 +0000 (UTC) X-CudaMail-Envelope-Sender: mchandras@suse.de From: Markos Chandras To: dev@openvswitch.org X-CudaMail-MID: CM-E1-509002275 X-CudaMail-DTE: 051016 X-CudaMail-Originating-IP: 195.135.220.15 Date: Tue, 10 May 2016 08:46:39 +0100 X-ASG-Orig-Subj: [##CM-E1-509002275##][PATCH] acinclude.m4: Fix skb_get_hash function detection Message-Id: <1462866399-32467-1-git-send-email-mchandras@suse.de> X-Mailer: git-send-email 2.8.1 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1462866412 X-Barracuda-Encrypted: ECDHE-RSA-AES256-GCM-SHA384 X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.60 X-Barracuda-Spam-Status: No, SCORE=0.60 using global scores of TAG_LEVEL=3.5 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=4.0 tests=BSF_SC5_MJ1963, RDNS_NONE X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.29450 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- 0.10 RDNS_NONE Delivered to trusted network by a host with no rDNS 0.50 BSF_SC5_MJ1963 Custom Rule MJ1963 Subject: [ovs-dev] [PATCH] acinclude.m4: Fix skb_get_hash function detection X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" 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 --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 23015fe..1a34ad8 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -486,7 +486,7 @@ 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_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])])