Change some old references to nicira-ext.h.

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 <cascardo@redhat.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>

diff --git a/lib/bundle.h b/lib/bundle.h
index 49db5d449f83f608832b3f1e7f7e59cecf1e6191..f5ce321448f731a0fb555c851a4125b12a3d0971 100644 (file)
--- 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 08f1990f1ccc39f21be89d4b9d64752a5cdbb5e9..adbbdf34016d92c6db6671ecf4d9e303e6465abc 100644 (file)
--- 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 d07f927dbe40cf6fd77f171abb14edcb4857e15b..e25adec1ca52f05e27bd8c3c958484ef8d55a693 100644 (file)
--- 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 d9caff130e3b6dfa738ee35e851f3d9b70bc65c4..3e72dff97a14c50aa62d10afc6542368ef1b01a6 100644 (file)
--- 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 1a38e4fed81dcd566c39abc78da3e40c85288a50..95289b7ef5cbea4f192819ee956b121e9d3181b2 100644 (file)
--- 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 da793c32cfe97078720249feb4ac35c107933775..99c14766c46ba4e38599dcdb6446ca275fcab486 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -3298,7 +3298,7 @@
           <code><var>field</var>[]</code> or
           <code><var>field</var>[<var>start</var>..<var>end</var>]</code>,
           e.g. <code>NXM_OF_IN_PORT[]</code>.  Please see
-          <code>nicira-ext.h</code> for a complete list of NXM field names.
+          <code>meta-flow.h</code> for a complete list of NXM field names.
         </p>
 
         <p>