From patchwork Tue Jan 12 01:53:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Stringer X-Patchwork-Id: 566245 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (unknown [IPv6:2600:3c00::f03c:91ff:fe6e:bdf7]) by ozlabs.org (Postfix) with ESMTP id CDAE71402BC for ; Tue, 12 Jan 2016 12:54:22 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id E7CCF1075E; Mon, 11 Jan 2016 17:54:16 -0800 (PST) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx3v3.cudamail.com (mx3.cudamail.com [64.34.241.5]) by archives.nicira.com (Postfix) with ESMTPS id 93579106FB for ; Mon, 11 Jan 2016 17:54:15 -0800 (PST) Received: from bar4.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id 2C5241622F8 for ; Mon, 11 Jan 2016 18:54:15 -0700 (MST) X-ASG-Debug-ID: 1452563654-03dc2115421ce80001-byXFYA Received: from mx3-pf2.cudamail.com ([192.168.14.1]) by bar4.cudamail.com with ESMTP id 4HnThQLjnJb63Wu0 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 11 Jan 2016 18:54:14 -0700 (MST) X-Barracuda-Envelope-From: joe@ovn.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.1 Received: from unknown (HELO relay2-d.mail.gandi.net) (217.70.183.194) by mx3-pf2.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 12 Jan 2016 01:54:14 -0000 Received-SPF: pass (mx3-pf2.cudamail.com: SPF record at ovn.org designates 217.70.183.194 as permitted sender) X-Barracuda-Apparent-Source-IP: 217.70.183.194 X-Barracuda-RBL-IP: 217.70.183.194 Received: from mfilter26-d.gandi.net (mfilter26-d.gandi.net [217.70.178.154]) by relay2-d.mail.gandi.net (Postfix) with ESMTP id E3092C5A3C; Tue, 12 Jan 2016 02:54:12 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mfilter26-d.gandi.net Received: from relay2-d.mail.gandi.net ([IPv6:::ffff:217.70.183.194]) by mfilter26-d.gandi.net (mfilter26-d.gandi.net [::ffff:10.0.15.180]) (amavisd-new, port 10024) with ESMTP id TEzsLT2OXmal; Tue, 12 Jan 2016 02:54:11 +0100 (CET) X-Originating-IP: 208.91.1.34 Received: from localhost.localdomain (unknown [208.91.1.34]) (Authenticated sender: joe@ovn.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 9C330C5A4E; Tue, 12 Jan 2016 02:54:10 +0100 (CET) X-CudaMail-Envelope-Sender: joe@ovn.org From: Joe Stringer To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V2-110058278 X-CudaMail-DTE: 011116 X-CudaMail-Originating-IP: 217.70.183.194 Date: Mon, 11 Jan 2016 17:53:49 -0800 X-ASG-Orig-Subj: [##CM-V2-110058278##][PATCH 01/13] compat: Detect and use inet_frag_queue->last_in. Message-Id: <1452563641-33507-2-git-send-email-joe@ovn.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452563641-33507-1-git-send-email-joe@ovn.org> References: <1452563641-33507-1-git-send-email-joe@ovn.org> X-Barracuda-Connect: UNKNOWN[192.168.14.1] X-Barracuda-Start-Time: 1452563654 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 Subject: [ovs-dev] [PATCH 01/13] compat: Detect and use inet_frag_queue->last_in. 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" Kernels 3.17 and older have this field, while newer kernels use the 'flags' field. Detect this in the build in case anyone backports this change to an older kernel. Signed-off-by: Joe Stringer --- acinclude.m4 | 3 +++ datapath/linux/compat/include/net/inet_frag.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 9d652c2aed13..b78244d6bf4f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -352,6 +352,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/net/ip.h], [ip_skb_dst_mtu]) OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h], [hashfn.*const], [OVS_DEFINE([HAVE_INET_FRAGS_CONST])]) + OVS_GREP_IFELSE([$KSRC/include/net/inet_frag.h], [last_in], + [OVS_DEFINE([HAVE_INET_FRAGS_LAST_IN])]) + OVS_GREP_IFELSE([$KSRC/include/net/dst_metadata.h], [metadata_dst]) OVS_GREP_IFELSE([$KSRC/include/linux/net.h], [sock_create_kern.*net], diff --git a/datapath/linux/compat/include/net/inet_frag.h b/datapath/linux/compat/include/net/inet_frag.h index 6e98ebc6990f..0c0c07619126 100644 --- a/datapath/linux/compat/include/net/inet_frag.h +++ b/datapath/linux/compat/include/net/inet_frag.h @@ -14,7 +14,7 @@ #endif #ifdef OVS_FRAGMENT_BACKPORT -#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) +#ifdef HAVE_INET_FRAGS_LAST_IN #define q_flags(q) (q->last_in) #define qp_flags(qp) (qp->q.last_in) #else