From patchwork Fri Sep 11 22:32:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Justin Pettit X-Patchwork-Id: 517040 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id A2389140082 for ; Sat, 12 Sep 2015 08:32:24 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id B0B4F10D2F; Fri, 11 Sep 2015 15:32:23 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id B5B2D10D2D for ; Fri, 11 Sep 2015 15:32:21 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 379621E02CD for ; Fri, 11 Sep 2015 16:32:21 -0600 (MDT) X-ASG-Debug-ID: 1442010740-03dc5353b50a040001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id i9gNW3B8FaEDgJKy (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Fri, 11 Sep 2015 16:32:20 -0600 (MDT) X-Barracuda-Envelope-From: jpettit@nicira.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mail-pa0-f50.google.com) (209.85.220.50) by mx1-pf1.cudamail.com with ESMTPS (RC4-SHA encrypted); 11 Sep 2015 22:32:19 -0000 Received-SPF: unknown (mx1-pf1.cudamail.com: Multiple SPF records returned) X-Barracuda-Apparent-Source-IP: 209.85.220.50 X-Barracuda-RBL-IP: 209.85.220.50 Received: by padhk3 with SMTP id hk3so86091828pad.3 for ; Fri, 11 Sep 2015 15:32:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id; bh=+umb27kTFzsh7iOfpTISNlSRfdfBCMk6QMiFv3PP/PQ=; b=N+MTXBqUEP5WOE18ikPnuyoMMeymOF+5GKbF7yp3Qf86e+YyunIYID2KwKQg7mTvjR JDqwIJIf1agapfN3KjrVe3Jjrs2KBfkmqhKIf7CzOeTwfzkzA2YiW6RmNdto1Y8fL+qt VNaqE3XTFVfr1bGmDa/KAR9TPMDJ4VqiEnAj6QsyvXAuP6890DCeaM7p7gyb4x+QrwOd k1ZuDt0hxGJXHeEsfRQ48MREWitqR31CNNpnKMqivyVxm8DGDof4eBAzSNB96BVSvhcf bDp4MW8ycjfGj+b4kgVTLfhAVt3meTwtCqwGwv3uWyI1KotTXPoBSGD2NBn5voxr6pyY LHoA== X-Gm-Message-State: ALoCoQlDj3s3z6aDoHhsVPIjeL9QZ7CXIXaxK4fIawLpxnY5dU/qzkvu/a/sJOe/G1LdFeerVUFn X-Received: by 10.68.65.80 with SMTP id v16mr2501533pbs.23.1442010739085; Fri, 11 Sep 2015 15:32:19 -0700 (PDT) Received: from localhost.localdomain ([208.91.2.4]) by smtp.gmail.com with ESMTPSA id pe5sm2281116pac.17.2015.09.11.15.32.17 for (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 Sep 2015 15:32:18 -0700 (PDT) X-CudaMail-Envelope-Sender: jpettit@nicira.com From: Justin Pettit To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-910083083 X-CudaMail-DTE: 091115 X-CudaMail-Originating-IP: 209.85.220.50 Date: Fri, 11 Sep 2015 15:32:12 -0700 X-ASG-Orig-Subj: [##CM-E1-910083083##][PATCH] expr: Fix crossproduct example. Message-Id: <1442010732-30886-1-git-send-email-jpettit@nicira.com> X-Mailer: git-send-email 1.7.5.4 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442010740 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 Subject: [ovs-dev] [PATCH] expr: Fix crossproduct example. 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: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" Signed-off-by: Justin Pettit Acked-by: Ben Pfaff --- ovn/lib/expr.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ovn/lib/expr.h b/ovn/lib/expr.h index b411e65..d755b55 100644 --- a/ovn/lib/expr.h +++ b/ovn/lib/expr.h @@ -210,7 +210,7 @@ const char *expr_level_to_string(enum expr_level); * ip6,actions=conjunction(1,1/3) * tp_src=1,actions=conjunction(1,2/3) * tp_src=2,actions=conjunction(1,2/3) - * tp_src=2,actions=conjunction(1,2/3) + * tp_src=3,actions=conjunction(1,2/3) * tp_dst=4,actions=conjunction(1,3/3) * tp_dst=5,actions=conjunction(1,3/3) * tp_dst=6,actions=conjunction(1,3/3) @@ -222,10 +222,10 @@ const char *expr_level_to_string(enum expr_level); * conj_id=1,actions=... * ip,tp_src=1,actions=conjunction(1,1/2) * ip,tp_src=2,actions=conjunction(1,1/2) - * ip,tp_src=2,actions=conjunction(1,1/2) + * ip,tp_src=3,actions=conjunction(1,1/2) * ip6,tp_src=1,actions=conjunction(1,1/2) * ip6,tp_src=2,actions=conjunction(1,1/2) - * ip6,tp_src=2,actions=conjunction(1,1/2) + * ip6,tp_src=3,actions=conjunction(1,1/2) * ip,tp_dst=4,actions=conjunction(1,2/2) * ip,tp_dst=5,actions=conjunction(1,2/2) * ip,tp_dst=6,actions=conjunction(1,2/2)