From patchwork Tue Jan 30 23:40:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 867716 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="tyiLQuU1"; 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 3zWNG64VpZz9s75 for ; Wed, 31 Jan 2018 10:42:22 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 49BB2F5D; Tue, 30 Jan 2018 23:40:41 +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 B6E18F46 for ; Tue, 30 Jan 2018 23:40:37 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EB8782F6 for ; Tue, 30 Jan 2018 23:40:36 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id e76so10687856pfk.1 for ; Tue, 30 Jan 2018 15:40:36 -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=q+oJqWUt+36aa3PdyrtuHLdgJ6/Q1/1mTd4hpGFHmhE=; b=tyiLQuU1ZGDb1ijsGMok7wtM8hu+5puGQbyxRJsq8DGD2tw06NIV2RVBBGlKOLAMlD wse8rZjJpGenp6wFSSrRpLk3xesYWnZw8dFFh35JrlHeMGeqqLNxihxYK0El0rkf8HXk QxFpw7VCF6sBHNqg6hydxKcWNmNh5xRROBbJjVqooC3Qrvpp+LuYPAM8tUhKitzr9k6N bU4UMiQyMsBM5E0dFrRS30X9g4rMEkWfLLhM9fa9JgUDB049gryOCBAdKzbw/ZWjIftv W8O4iOC/CiR5ImlYYPzPe1UHkG/ni8hWzh6aggjktO1to586ZgDRfZ9mSqVzpef1vooN v2dQ== 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=q+oJqWUt+36aa3PdyrtuHLdgJ6/Q1/1mTd4hpGFHmhE=; b=fTQj77N9ZnsiG62Cmdhsh6pMiSCYwv1tXYg9TBGisyuZ6ihd3+lOe4oKxUthiPSAZt A7Frs7dDFOSNKgMJn1nDWk6RTYtXZ8WEb8TTY3eG0bWjVlx+s0YvhqtKgxuGrk3++5bs fgYRpDIuFSseMEYpBocgYCBuurXPOcy+DyCo7OfWT5xKVsTljeAOSwUY4tPmheGEcDtX W5gpqhqyrFugxa+suHOGPcFFcpvEmxdK/wNIkbTQr8TNWtfdLyhpiQ2GVN24JDLCJW2V WLDZ325QA7HBrg7UpPuqhL04d7vZkHkmv+aCT1ep4292cy9AVNK66II9sqIJpHhxuo3k L8sA== X-Gm-Message-State: AKwxytdLgaQG4/YU3nLyPu9ngDAcr5hW7zGfEmQ0CYF64NT79wClAqpB YNAkez+c+WQf+WgFfi+yYolyKg== X-Google-Smtp-Source: AH8x227Ju04eY5nF3PS2jR8/z0M5cHi3i03Z3WvE8QAG0n666/y2oy4p4Lu7Qwt4o0nN/sc4QmgH3w== X-Received: by 10.98.66.152 with SMTP id h24mr31679074pfd.13.1517355636195; Tue, 30 Jan 2018 15:40:36 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id q16sm41403851pfg.124.2018.01.30.15.40.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 15:40:35 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Tue, 30 Jan 2018 15:40:05 -0800 Message-Id: <1517355622-26114-4-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517355622-26114-1-git-send-email-gvrose8192@gmail.com> References: <1517355622-26114-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 Cc: Florian Westphal Subject: [ovs-dev] [PATCH 03/20] 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 From: Florian Westphal 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 3f79433..a75ae3c 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;