From patchwork Mon Mar 21 19:43:34 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jesse Gross X-Patchwork-Id: 600294 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 3qTR9J0rdMz9s2k for ; Tue, 22 Mar 2016 06:44:19 +1100 (AEDT) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 24FC3105E3; Mon, 21 Mar 2016 12:44:13 -0700 (PDT) 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 9808D105E1 for ; Mon, 21 Mar 2016 12:44:11 -0700 (PDT) Received: from bar6.cudamail.com (localhost [127.0.0.1]) by mx3v3.cudamail.com (Postfix) with ESMTPS id F27B6161429 for ; Mon, 21 Mar 2016 13:44:10 -0600 (MDT) X-ASG-Debug-ID: 1458589450-0b323727626c43a0001-byXFYA Received: from mx3-pf1.cudamail.com ([192.168.14.2]) by bar6.cudamail.com with ESMTP id on2Xi4GdHv0XDyCc (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 21 Mar 2016 13:44:10 -0600 (MDT) X-Barracuda-Envelope-From: jesse@kernel.org X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.2 Received: from unknown (HELO mail.kernel.org) (198.145.29.136) by mx3-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 21 Mar 2016 19:44:10 -0000 Received-SPF: none (mx3-pf1.cudamail.com: domain at kernel.org does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 198.145.29.136 X-Barracuda-RBL-IP: 198.145.29.136 Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9A38A201F5; Mon, 21 Mar 2016 19:44:09 +0000 (UTC) Received: from localhost.localdomain (unknown [208.91.2.4]) (using TLSv1.2 with cipher AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 69C6E201C8; Mon, 21 Mar 2016 19:44:08 +0000 (UTC) X-CudaMail-Envelope-Sender: jesse@kernel.org From: Jesse Gross To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-V1-320044573 X-CudaMail-DTE: 032116 X-CudaMail-Originating-IP: 198.145.29.136 Date: Mon, 21 Mar 2016 12:43:34 -0700 X-ASG-Orig-Subj: [##CM-V1-320044573##][PATCH] datapath: Check for sock argument to v6ops->fragment. Message-Id: <1458589414-41954-1-git-send-email-jesse@kernel.org> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP X-Barracuda-Connect: UNKNOWN[192.168.14.2] X-Barracuda-Start-Time: 1458589450 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 Cc: Aaron Rosen Subject: [ovs-dev] [PATCH] datapath: Check for sock argument to v6ops->fragment. 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: , Errors-To: dev-bounces@openvswitch.org Sender: "dev" Ubuntu 3.13.0-83-generic has backported a patch that adds an intermediate version of the v6ops->fragment function that doesn't seem to ever been part of a released upstream kernel. This version is missing the sock argument to the fragment function. Since we already have a backported version of the function from a newer kernel, this simply ignores the version that Ubuntu is now making available and continues to use the OVS version, similar to what it was doing before. Reported-by: Zoltán Balogh Reported-by: Aaron Rosen Reported-by: Russell Bryant Signed-off-by: Jesse Gross Acked-by: Russell Bryant --- acinclude.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index 74f0494..f345c31 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -393,7 +393,7 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_GREP_IFELSE([$KSRC/include/linux/netfilter.h], [nf_hookfn.*nf_hook_ops], [OVS_DEFINE([HAVE_NF_HOOKFN_ARG_OPS])]) OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netfilter_ipv6.h], [nf_ipv6_ops], - [fragment], [OVS_DEFINE([HAVE_NF_IPV6_OPS_FRAGMENT])]) + [fragment.*sock], [OVS_DEFINE([HAVE_NF_IPV6_OPS_FRAGMENT])]) OVS_GREP_IFELSE([$KSRC/include/net/netfilter/nf_conntrack.h], [tmpl_alloc.*conntrack_zone],