mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-22 01:51:26 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
Reported-by: Jean Tourrilhes <jt@hpl.hp.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Jean Tourrilhes <jt@hpl.hp.com>
This commit is contained in:
Ben Pfaff 2015-02-24 21:02:50 -08:00
parent bbc45f03d9
commit d3cb080e54
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -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.
* 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

4
lib/meta-flow.h
View File

@ -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.
@ -577,7 +577,7 @@ enum OVS_PACKED_ENUM mf_field_id {
#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,

4
lib/ofp-actions.c
View File

@ -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.
@ -2121,7 +2121,7 @@ decode_ofpat_set_field(const struct ofp12_action_set_field *oasf,
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)

8
utilities/ovs-ofctl.8.in
View File

@ -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
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''.
@ -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
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
@ -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
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
@ -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
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