From patchwork Thu Dec 7 17:01:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 845700 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="GmHK1NMq"; 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 3yt24836S2z9t2d for ; Fri, 8 Dec 2017 04:08:08 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id E7135CEF; Thu, 7 Dec 2017 17:08:05 +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 7E9182C for ; Thu, 7 Dec 2017 17:08:04 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1A0B6FE for ; Thu, 7 Dec 2017 17:08:04 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id j9so4874989pgc.11 for ; Thu, 07 Dec 2017 09:08:04 -0800 (PST) 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=wKoxoHMTjmkPCf5CNBljipbwgdTx2sjMuZjeQwZIFuc=; b=GmHK1NMqKU/fv5NMaVKAkjdI7grJU0tAUKLZsKNZ2JplaJsYGJC6lP5ZxxhbqgexFn KvifUT+dzx1/n2FmFqkrIYqdic/+1SbMviQ0/aaj0zMxi9XhQBA8A3B48woRYeYxKuwa v7p1Q8b6HMJfAkabr4uB76/hCXAtuysHmlWAyL/o64KAcNWm3dCVRZhJ37N0yai9kB32 BIlY54pg9uQB3WheBjXE4unEet5rra7LmuqLaW667HPL34a35Q9E8O3y7UK070nr4WDj eSbylf1cc+t1YiHdHsmILpJYw/cKOxkSk3XrWuZ9UYfCp82p5YvfKSEVwfb56uJnQ+3r V/3Q== 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=wKoxoHMTjmkPCf5CNBljipbwgdTx2sjMuZjeQwZIFuc=; b=TBx0+1HEJjNH7wphnmWXjJGmahv6kjhJocxgt3enKpy7OrlBn+5Kz07u+IcaRomrzM Io+4ONaovE7CPqNoaczdtEiO+God+zq7HEvXgTwF3YO4YIMdW2Pex1+SjNh33V1ecMdd aPReJ+fptffz6qMMpOsEl0bRK4Z61/TDDzH4ZUOBIvmu273NI8sqkjQ2CHEmxFU2xMPk XgteivrAI/o8vF8CL2WcUQsD6F/ZL1wp3HgiA2Q9nEDjZvlJJOu33e9RKeuNNO5D2SVq 1kzrS4rA25osnTuSw32GOJson1jwvcJUGuxhDaOBFsHssoCiJg/+Ob7RlOCwUVJtVjwh 5vBQ== X-Gm-Message-State: AJaThX4SoRiCaiXIFghuYJfpBtqV23nBhvnK6VheLf3vmorhkOZaNtDP fmgbV0MpGGIH4Kna3riDhxTIM5N6 X-Google-Smtp-Source: AGs4zMazPUFnj2PHZULf9fdTagMnfhwiPNU/owP4n8QdA+yiQNxG63HN8gQx/B0HqRXbHpo+VSi2rA== X-Received: by 10.159.198.1 with SMTP id f1mr26572331plo.450.1512666085937; Thu, 07 Dec 2017 09:01:25 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id u18sm10549134pgn.72.2017.12.07.09.01.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 09:01:24 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Thu, 7 Dec 2017 09:01:12 -0800 Message-Id: <1512666075-11857-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512666075-11857-1-git-send-email-gvrose8192@gmail.com> References: <1512666075-11857-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE 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 V2 3/6] datapath: conntrack: make protocol tracker pointers const 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 commit: commit b3480fe059ac9121b5714205b4ddae14b59ef4be Author: Florian Westphal Date: Sat Aug 12 00:57:08 2017 +0200 netfilter: conntrack: make protocol tracker pointers const Doesn't change generated code, but will make it easier to eventually make the actual trackers themselvers const. Signed-off-by: Florian Westphal Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Rose --- datapath/conntrack.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/conntrack.c b/datapath/conntrack.c index d517a87..c97e3e4 100644 --- a/datapath/conntrack.c +++ b/datapath/conntrack.c @@ -613,8 +613,8 @@ static struct nf_conn * ovs_ct_find_existing(struct net *net, const struct nf_conntrack_zone *zone, u8 l3num, struct sk_buff *skb, bool natted) { - struct nf_conntrack_l3proto *l3proto; - struct nf_conntrack_l4proto *l4proto; + const struct nf_conntrack_l3proto *l3proto; + const struct nf_conntrack_l4proto *l4proto; struct nf_conntrack_tuple tuple; struct nf_conntrack_tuple_hash *h; struct nf_conn *ct;