From patchwork Fri Sep 30 18:31:03 2016
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo
X-Patchwork-Id: 677166
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 3sm0Pz0H5Hz9sdn
for ;
Sat, 1 Oct 2016 04:31:18 +1000 (AEST)
Received: from archives.nicira.com (localhost [127.0.0.1])
by archives.nicira.com (Postfix) with ESMTP id 015E110895;
Fri, 30 Sep 2016 11:31:16 -0700 (PDT)
X-Original-To: dev@openvswitch.org
Delivered-To: dev@openvswitch.org
Received: from mx1e3.cudamail.com (mx1.cudamail.com [69.90.118.67])
by archives.nicira.com (Postfix) with ESMTPS id B9B8C10892
for ; Fri, 30 Sep 2016 11:31:14 -0700 (PDT)
Received: from bar5.cudamail.com (localhost [127.0.0.1])
by mx1e3.cudamail.com (Postfix) with ESMTPS id 344D8420142
for ; Fri, 30 Sep 2016 12:31:14 -0600 (MDT)
X-ASG-Debug-ID: 1475260273-09eadd438600a70001-byXFYA
Received: from mx3-pf3.cudamail.com ([192.168.14.3]) by bar5.cudamail.com
with
ESMTP id DcIQKI0u2mlMcTBG (version=TLSv1 cipher=DHE-RSA-AES256-SHA
bits=256 verify=NO) for ;
Fri, 30 Sep 2016 12:31:13 -0600 (MDT)
X-Barracuda-Envelope-From: cascardo@redhat.com
X-Barracuda-RBL-Trusted-Forwarder: 192.168.14.3
Received: from unknown (HELO mx1.redhat.com) (209.132.183.28)
by mx3-pf3.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted);
30 Sep 2016 18:31:13 -0000
Received-SPF: pass (mx3-pf3.cudamail.com: SPF record at _spf1.redhat.com
designates 209.132.183.28 as permitted sender)
X-Barracuda-Apparent-Source-IP: 209.132.183.28
X-Barracuda-RBL-IP: 209.132.183.28
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256
bits)) (No client certificate requested)
by mx1.redhat.com (Postfix) with ESMTPS id 840FF624A9
for ; Fri, 30 Sep 2016 18:31:12 +0000 (UTC)
Received: from indiana.gru.redhat.com (ovpn-116-120.phx2.redhat.com
[10.3.116.120])
by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with
ESMTP id u8UIVBE8019677
for ; Fri, 30 Sep 2016 14:31:11 -0400
X-CudaMail-Envelope-Sender: cascardo@redhat.com
From: Thadeu Lima de Souza Cascardo
To: dev@openvswitch.org
X-CudaMail-Whitelist-To: dev@openvswitch.org
X-CudaMail-MID: CM-V3-929037476
X-CudaMail-DTE: 093016
X-CudaMail-Originating-IP: 209.132.183.28
Date: Fri, 30 Sep 2016 15:31:03 -0300
X-ASG-Orig-Subj: [##CM-V3-929037476##][PATCH] Change some old references to
nicira-ext.h.
Message-Id: <1475260263-29094-1-git-send-email-cascardo@redhat.com>
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16
(mx1.redhat.com [10.5.110.39]); Fri, 30 Sep 2016 18:31:12 +0000 (UTC)
X-Barracuda-Connect: UNKNOWN[192.168.14.3]
X-Barracuda-Start-Time: 1475260273
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] Change some old references to nicira-ext.h.
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"
Some of these references are not valid anymore, as things were moved to
either meta-flow.h or ofp-actions.c.
Signed-off-by: Thadeu Lima de Souza Cascardo
---
lib/bundle.h | 2 +-
lib/learn.h | 2 +-
lib/meta-flow.c | 2 +-
tests/learn.at | 2 +-
tutorial/Tutorial.md | 3 ++-
vswitchd/vswitch.xml | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/bundle.h b/lib/bundle.h
index 49db5d4..f5ce321 100644
--- a/lib/bundle.h
+++ b/lib/bundle.h
@@ -34,7 +34,7 @@ struct ofpbuf;
/* NXAST_BUNDLE helper functions.
*
- * See include/openflow/nicira-ext.h for NXAST_BUNDLE specification. */
+ * See lib/ofp-actions.c for NXAST_BUNDLE specification. */
#define BUNDLE_MAX_SLAVES 2048
diff --git a/lib/learn.h b/lib/learn.h
index 08f1990..adbbdf3 100644
--- a/lib/learn.h
+++ b/lib/learn.h
@@ -30,7 +30,7 @@ struct nx_action_learn;
/* NXAST_LEARN helper functions.
*
- * See include/openflow/nicira-ext.h for NXAST_LEARN specification.
+ * See lib/ofp-actions.c for NXAST_LEARN specification.
*/
enum ofperr learn_check(const struct ofpact_learn *, const struct flow *);
diff --git a/lib/meta-flow.c b/lib/meta-flow.c
index d07f927..e25adec 100644
--- a/lib/meta-flow.c
+++ b/lib/meta-flow.c
@@ -416,7 +416,7 @@ mf_are_prereqs_ok(const struct mf_field *mf, const struct flow *flow,
* all. For example, the MFF_VLAN_TCI field will never have a nonzero value
* without the VLAN_CFI bit being set, but we can't reject those values because
* it is still legitimate to test just for those bits (see the documentation
- * for NXM_OF_VLAN_TCI in nicira-ext.h). On the other hand, there is never a
+ * for NXM_OF_VLAN_TCI in meta-flow.h). On the other hand, there is never a
* reason to set the low bit of MFF_IP_DSCP to 1, so we reject that. */
bool
mf_is_value_valid(const struct mf_field *mf, const union mf_value *value)
diff --git a/tests/learn.at b/tests/learn.at
index d9caff1..3e72dff 100644
--- a/tests/learn.at
+++ b/tests/learn.at
@@ -45,7 +45,7 @@ AT_CLEANUP
AT_SETUP([learning action - examples])
AT_DATA([flows.txt], [[
-# These are the examples from nicira-ext.h.
+# These are the examples from ofp-actions.c.
actions=learn(in_port=99,NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[], load:NXM_OF_IN_PORT[]->NXM_NX_REG1[16..31])
actions=learn(NXM_OF_VLAN_TCI[0..11], NXM_OF_ETH_DST[]=NXM_OF_ETH_SRC[],output:NXM_OF_IN_PORT[])
table=0 actions=learn(table=1,hard_timeout=10, NXM_OF_VLAN_TCI[0..11],output:NXM_OF_IN_PORT[]), resubmit(,1)
diff --git a/tutorial/Tutorial.md b/tutorial/Tutorial.md
index 1a38e4f..95289b7 100644
--- a/tutorial/Tutorial.md
+++ b/tutorial/Tutorial.md
@@ -20,7 +20,8 @@ tutorial will not help you.
This tutorial does not cover every aspect of the features that it
mentions. You can find the details elsewhere in the Open vSwitch
documentation, especially `ovs-ofctl(8)` and the comments in the
-`include/openflow/nicira-ext.h` header file.
+`include/openflow/nicira-ext.h` and `include/openvswitch/meta-flow.h`
+header files.
> In this tutorial, paragraphs set off like this designate notes
> with additional information that readers may wish to skip on a
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 976f3ca..9758674 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -3322,7 +3322,7 @@
field[]
or
field[start..end]
,
e.g. NXM_OF_IN_PORT[]
. Please see
- nicira-ext.h
for a complete list of NXM field names.
+ meta-flow.h
for a complete list of NXM field names.