@@ -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
@@ -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 *);
@@ -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)
@@ -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)
@@ -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
@@ -3322,7 +3322,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>
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> --- 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(-)