From patchwork Wed Jul 19 20:57:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 791233 X-Patchwork-Delegate: joestringer@nicira.com 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; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dkH6Z4TO"; 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 3xCTrG5Symz9t2x for ; Thu, 20 Jul 2017 06:57:50 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 686EFA88; Wed, 19 Jul 2017 20:57:21 +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 DA05494F for ; Wed, 19 Jul 2017 20:57:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f68.google.com (mail-pg0-f68.google.com [74.125.83.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9C176201 for ; Wed, 19 Jul 2017 20:57:19 +0000 (UTC) Received: by mail-pg0-f68.google.com with SMTP id z1so941449pgs.0 for ; Wed, 19 Jul 2017 13:57:19 -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=lPvgiU9iHhIlcrgimNKagkG4kghLC+mVYRZF9TnxdR4=; b=dkH6Z4TO9U4Xwi68Rz8IBrahw2qHccKu810ylET0JVDHB7ug+kSY0vaCrALaHy/FR+ X5A6wSwR3HG7Yi3dQFA74tvYBvH3APBfWifSEXh/91Qa0kPUM98qHxylt6ekiNye1ZEe qb0KTx931gepTL9+WBWjw82gtnJlXdETjArj6K5GWLh09Enb3McrDfvCS/oTrEJm/u34 LCpotUPmNC/S8HCltiRlkzvvaCxEUIQb82dQHlt6Ajv9u/d94R65n7MEgPDM6FaqUiE7 Rfp4I2/UUqhbof/YbAbiKDazn+rV+z8IHd+Y+uRDobsgJKZW5xqPb42os9SUMOWHqA2w tT+Q== 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=lPvgiU9iHhIlcrgimNKagkG4kghLC+mVYRZF9TnxdR4=; b=pLJ5wtpTwA3NFoj79KgrYDijgkdb2N43aRqjNAVGfOR/3cKduDJsVu1iuMPdMfLroN SBGX2bRUhzE0ONu6i9saeiOfx8Ub38YUa/3Pwf5ZtkNW8rFcIhJe1ZCxrOCECsCJk7t6 ipEI4S/YM8T+ZvEEJRgUF0/ruPvCK2g5Fa9MNwY5/n85sZFrbri8XJ+Tgo92hRmnSwhD gez95Gdt3nTMCVuC7TQHw84EQBQNEg4EMQkf5MTHPiI3d0yb+zFEdigDMSzVSpoLO+fz Y2fcTYlWcENSE4w2k7dv27nAwdSUZblQhZYjaK52Zu7PyI6gr9WThofHPxjbM0dDmxc0 8EtQ== X-Gm-Message-State: AIVw112IdzvOBcAI98pxZr2hLrKn/Lg6HzjyOkZNpawzeo+4R3oApaiN 6Y5AqkW2N9vAkg57 X-Received: by 10.99.2.81 with SMTP id 78mr1395894pgc.33.1500497838835; Wed, 19 Jul 2017 13:57:18 -0700 (PDT) Received: from gizo.domain (184-100-139-69.ptld.qwest.net. [184.100.139.69]) by smtp.gmail.com with ESMTPSA id g79sm1171576pfd.163.2017.07.19.13.57.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Jul 2017 13:57:17 -0700 (PDT) From: Greg Rose To: dev@openvswitch.org Date: Wed, 19 Jul 2017 13:57:06 -0700 Message-Id: <1500497833-30066-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1500497833-30066-1-git-send-email-gvrose8192@gmail.com> References: <1500497833-30066-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,RCVD_IN_SORBS_SPAM autolearn=no 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/8] acinclude.m4: Support Linux kernel 4.12 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 Allow datapath kernel modules to be configured and built for kernels up to 4.12. Adds a new define for the kernel compatibility layer to indicate whether upstream commit cf124db566e6 ("net: Fix inconsistent teardown and release of private netdev state.") is present. Adds a new define for the kernel compatibility layer to indicate whether upstream commit dc5321d79697 ("vxlan: get rid of redundant vxlan_dev.flags") is present. Adds a new define for the kernel compatibility layer to indicate whether upstream commit d91fc59cd77c ("netfilter: introduce nf_conntrack_helper_put helper function") is present. Signed-off-by: Greg Rose --- acinclude.m4 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index e7affc5..0be7a63 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -143,7 +143,7 @@ AC_DEFUN([OVS_CHECK_LINUX], [ AC_MSG_RESULT([$kversion]) if test "$version" -ge 4; then - if test "$version" = 4 && test "$patchlevel" -le 11; then + if test "$version" = 4 && test "$patchlevel" -le 12; then : # Linux 4.x else AC_ERROR([Linux kernel in $KBUILD is version $kversion, but version newer than 4.11.x is not supported (please refer to the FAQ for advice)]) @@ -748,6 +748,15 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ [OVS_DEFINE([HAVE_DEFRAG_ENABLE_TAKES_NET])]) OVS_GREP_IFELSE([$KSRC/include/net/genetlink.h], [family_list], [OVS_DEFINE([HAVE_GENL_FAMILY_LIST])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device], + [needs_free_netdev], + [OVS_DEFINE([HAVE_NEEDS_FREE_NETDEV])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/net/vxlan.h], [vxlan_dev], + [cfg], + [OVS_DEFINE([HAVE_VXLAN_DEV_CFG])]) + OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack_helper.h], + [nf_conntrack_helper_put], + [OVS_DEFINE([HAVE_NF_CONNTRACK_HELPER_PUT])]) if cmp -s datapath/linux/kcompat.h.new \ datapath/linux/kcompat.h >/dev/null 2>&1; then