From patchwork Fri May 10 19:30:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yifeng Sun X-Patchwork-Id: 1098303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Rc8qfE3T"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4510gM5RV8z9s3q for ; Sat, 11 May 2019 05:30:55 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 405A7E5D; Fri, 10 May 2019 19:30:24 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E4216504 for ; Fri, 10 May 2019 19:30:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9B1FD709 for ; Fri, 10 May 2019 19:30:21 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id c6so3722296pfa.10 for ; Fri, 10 May 2019 12:30:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mWmi6sKz2fqu7iru1d/ryRK/JCeMEYZ+Y8f5MkNql4k=; b=Rc8qfE3T/G6gcdpx947gEZlAvflYOH9BRGYhStZpVdxciie9ctRoFECZEBbUxG/dHp dqErGetBtSxoDPlwKLo+RJsqKsLE2OCoilv8loRTaiyKVyfxtFAxYbkfoGQK6PhXvbFP +h2z/w0kYseVIK8atYC51R09eM61oPXF1++uvkXB26O8MjZpfr5ImT4kxfin8Yxugwd8 /N7nqp/5pgkFUHlBVZwAzJE9MJXpux7WDlIhx18In7KSOZzBjDby7InRl0I4llKaUsUc AJupUw+De5Cprvxn6QFERW2lYHj3eL75LEG7bWuUAIlnnHHdRRfdkuK3lausThThxZOr kmAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mWmi6sKz2fqu7iru1d/ryRK/JCeMEYZ+Y8f5MkNql4k=; b=BBa181RfJsyKqSBnuouop1x4XhTKPeT/wP0KlKqHVcHgTVtVCdJKOwHYw/yiAcrwmA Uuz0K9zKeNJcOCb4ws0vjfdCTcp1e7J54TYwu8+FTwPUMdkSH6NumNBCf3rAdov4J0t1 ozw9WtfLcTL2KPdsPCTXfw7IbV3u9UwsA1KMRyPeR4DknmmAZrZyaP3lNhh7rambfqCk JEo9fMdMCAkeDVG8xzyi1VrfZd890A8mRw4dCSFqVMM/9lg1zq25uuMVVpUcK1Ajsaa0 cGdwOwGj0JLp6UBMDgd7e/rvkqQ3hrExlVeZ1YQMobFdM/XpCFNfADlIJooyTGgcxDiT C6qQ== X-Gm-Message-State: APjAAAWAfdpvp/ikfGYHtSk9iVIQiwZ75TheqySGUnl3XtFknq1d62pu z4TkTbib1ZCx9VT3hwZtOSdZ9ah6 X-Google-Smtp-Source: APXvYqyrBAOWGwtYWVxNR6vSJgwn2+VPfEHAnMxZUf6Z6BLZFLSO2DmMkAq9ThqBW0dU+0wQljoMCQ== X-Received: by 2002:a63:494f:: with SMTP id y15mr1263276pgk.56.1557516620979; Fri, 10 May 2019 12:30:20 -0700 (PDT) Received: from kern417.eng.vmware.com ([66.170.99.2]) by smtp.gmail.com with ESMTPSA id h13sm6423301pgk.55.2019.05.10.12.30.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 10 May 2019 12:30:20 -0700 (PDT) From: Yifeng Sun To: dev@openvswitch.org Date: Fri, 10 May 2019 12:30:08 -0700 Message-Id: <1557516614-12563-2-git-send-email-pkusunyifeng@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1557516614-12563-1-git-send-email-pkusunyifeng@gmail.com> References: <1557516614-12563-1-git-send-email-pkusunyifeng@gmail.com> X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 1/7 v3] datapath: Handle removal of nf_conntrack_l3proto.h X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Upstream kernel commit a0ae2562 ("netfilter: conntrack: remove l3proto abstraction") removed header file net/netfilter/nf_conntrack_l3proto.h. This patch detects it and fixes compilation errors of OVS on 4.19+ kernels. Signed-off-by: Yifeng Sun Acked-by: Yi-Hung Wei --- acinclude.m4 | 3 +++ datapath/linux/compat/nf_conntrack_proto.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index b532a4579266..c9b744db0b94 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -926,6 +926,9 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_KVMALLOC_ARRAY])]) OVS_GREP_IFELSE([$KSRC/include/linux/mm.h], [kvmalloc_node], [OVS_DEFINE([HAVE_KVMALLOC_NODE])]) + OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_l3proto.h], + [nf_conntrack_l3proto], + [OVS_DEFINE([HAVE_NF_CONNTRACK_L3PROATO_H])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then diff --git a/datapath/linux/compat/nf_conntrack_proto.c b/datapath/linux/compat/nf_conntrack_proto.c index 4ac66f61c70d..fe291dbf25e1 100644 --- a/datapath/linux/compat/nf_conntrack_proto.c +++ b/datapath/linux/compat/nf_conntrack_proto.c @@ -1,7 +1,9 @@ #include #include +#ifdef HAVE_NF_CONNTRACK_L3PROATO_H #include +#endif /* * Upstream net-next commmit 7e35ec0e8044