OpenFlow 1.5 is final, so change OF1.5 draft references to just say OF1.5.

Reported-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>

diff --git a/NEWS b/NEWS
index 57ab8b6..e20dc83 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,10 +25,10 @@ Post-v2.3.0
      release.  See ovs-vswitchd(8) for details.
    - OpenFlow:
      * IPv6 flow label and neighbor discovery fields are now modifiable.
      release.  See ovs-vswitchd(8) for details.
    - OpenFlow:
      * IPv6 flow label and neighbor discovery fields are now modifiable.

-     * OpenFlow 1.5 (draft) extended registers are now supported.
-     * The OpenFlow 1.5 (draft) actset_output field is now supported.
-     * OpenFlow 1.5 (draft) Copy-Field action is now supported.
-     * OpenFlow 1.5 (draft) masked Set-Field action is now supported.
+     * OpenFlow 1.5 extended registers are now supported.
+     * The OpenFlow 1.5 actset_output field is now supported.
+     * OpenFlow 1.5 Copy-Field action is now supported.
+     * OpenFlow 1.5 masked Set-Field action is now supported.

      * OpenFlow 1.3+ table features requests are now supported (read-only).
      * Nicira extension "move" actions may now be included in action sets.
      * "resubmit" actions may now be included in action sets.  The resubmit
      * OpenFlow 1.3+ table features requests are now supported (read-only).
      * Nicira extension "move" actions may now be included in action sets.
      * "resubmit" actions may now be included in action sets.  The resubmit

diff --git a/lib/meta-flow.h b/lib/meta-flow.h
index d29cc64..0e09036 100644 (file)
--- a/lib/meta-flow.h
+++ b/lib/meta-flow.h
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2011, 2012, 2013, 2014, 2015 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -577,7 +577,7 @@ enum OVS_PACKED_ENUM mf_field_id {
 #if FLOW_N_XREGS == 4
     /* "xreg<N>".
      *
 #if FLOW_N_XREGS == 4
     /* "xreg<N>".
      *

-     * OpenFlow 1.5 (draft) ``extended register".  Each extended register
+     * OpenFlow 1.5 ``extended register".  Each extended register

      * overlays two of the Nicira extension 32-bit registers: xreg0 overlays
      * reg0 and reg1, with reg0 supplying the most-significant bits of xreg0
      * and reg1 the least-significant.  xreg1 similarly overlays reg2 and reg3,
      * overlays two of the Nicira extension 32-bit registers: xreg0 overlays
      * reg0 and reg1, with reg0 supplying the most-significant bits of xreg0
      * and reg1 the least-significant.  xreg1 similarly overlays reg2 and reg3,

diff --git a/lib/ofp-actions.c b/lib/ofp-actions.c
index e694fd9..765725e 100644 (file)
--- a/lib/ofp-actions.c
+++ b/lib/ofp-actions.c
@@ -1,5 +1,5 @@
 /*
 /*

- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc.

  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.


@@ -2121,7 +2121,7 @@ decode_ofpat_set_field(const struct ofp12_action_set_field *oasf,
         return OFPERR_OFPBAC_BAD_SET_ARGUMENT;
     }
 
         return OFPERR_OFPBAC_BAD_SET_ARGUMENT;
     }
 

-    /* The value must be valid for match.  The OpenFlow 1.5 draft also says,
+    /* The value must be valid for match.  OpenFlow 1.5 also says,

      * "In an OXM_OF_VLAN_VID set-field action, the OFPVID_PRESENT bit must be
      * a 1-bit in oxm_value and in oxm_mask." */
     if (!mf_is_value_valid(sf->field, &sf->value)
      * "In an OXM_OF_VLAN_VID set-field action, the OFPVID_PRESENT bit must be
      * a 1-bit in oxm_value and in oxm_mask." */
     if (!mf_is_value_valid(sf->field, &sf->value)

diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
index d548923..7aee788 100644 (file)
--- a/utilities/ovs-ofctl.8.in
+++ b/utilities/ovs-ofctl.8.in
@@ -1153,7 +1153,7 @@ least-significant.  \fBxreg1\fR similarly overlays \fBreg2\fR and
 \fBreg3\fR, and so on.
 .IP
 These fields were added in Open vSwitch 2.3 to conform with the
 \fBreg3\fR, and so on.
 .IP
 These fields were added in Open vSwitch 2.3 to conform with the

-OpenFlow 1.5 (draft) specification.  OpenFlow 1.5 calls these fields
+OpenFlow 1.5 specification.  OpenFlow 1.5 calls these fields

 just the ``packet registers,'' but Open vSwitch already had 32-bit
 registers by that name, which is why Open vSwitch refers to the
 standard registers as ``extended registers''.
 just the ``packet registers,'' but Open vSwitch already had 32-bit
 registers by that name, which is why Open vSwitch refers to the
 standard registers as ``extended registers''.


@@ -1174,7 +1174,7 @@ output group in the OpenFlow action set), then the value will be
 \fBUNSET\fR.
 .IP
 This field was introduced in Open vSwitch 2.4 to conform with the
 \fBUNSET\fR.
 .IP
 This field was introduced in Open vSwitch 2.4 to conform with the

-OpenFlow 1.5 (draft) specification.
+OpenFlow 1.5 specification.

 .
 .IP \fBconj_id=\fIvalue\fR
 Matches the given 32-bit \fIvalue\fR against the conjunction ID.  This
 .
 .IP \fBconj_id=\fIvalue\fR
 Matches the given 32-bit \fIvalue\fR against the conjunction ID.  This


@@ -1485,7 +1485,7 @@ significant 16 bits of register 0 into the VLAN TCI field.
 .IP
 In OpenFlow 1.0 through 1.4, \fBmove\fR ordinarily uses an Open
 vSwitch extension to OpenFlow.  In OpenFlow 1.5, \fBmove\fR uses the
 .IP
 In OpenFlow 1.0 through 1.4, \fBmove\fR ordinarily uses an Open
 vSwitch extension to OpenFlow.  In OpenFlow 1.5, \fBmove\fR uses the

-OpenFlow 1.5 (draft) standard \fBcopy_field\fR action.  The ONF has
+OpenFlow 1.5 standard \fBcopy_field\fR action.  The ONF has

 also made \fBcopy_field\fR available as an extension to OpenFlow 1.3.
 Open vSwitch 2.4 and later understands this extension and uses it if a
 controller uses it, but for backward compatibility with older versions
 also made \fBcopy_field\fR available as an extension to OpenFlow 1.3.
 Open vSwitch 2.4 and later understands this extension and uses it if a
 controller uses it, but for backward compatibility with older versions


@@ -2269,7 +2269,7 @@ The 32-bit integer group id of the bucket.  Values greater than
 0xffffff00 are reserved.
 .
 This field was added in Open vSwitch 2.4 to conform with the OpenFlow
 0xffffff00 are reserved.
 .
 This field was added in Open vSwitch 2.4 to conform with the OpenFlow

-1.5 (draft) specification. It is not supported when earlier versions
+1.5 specification. It is not supported when earlier versions

 of OpenFlow are used.  Open vSwitch will automatically allocate bucket
 ids when they are not specified.
 .IP \fBactions=\fR[\fIaction\fR][\fB,\fIaction\fR...]\fR
 of OpenFlow are used.  Open vSwitch will automatically allocate bucket
 ids when they are not specified.
 .IP \fBactions=\fR[\fIaction\fR][\fB,\fIaction\fR...]\fR