diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-11-28 20:43:02 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-11-29 08:04:32 -0800 |
| commit | e71bff1bef0252209d01e618a33d80d59e366829 (patch) | |
| tree | 15e5943cac6a34336a4ce29e7e7f9582391198c5 /utilities | |
| parent | 6d2c051a33bccc913259baa14134dd0356530b26 (diff) | |
ofp-util: Make "OXM" flow format name include both OpenFlow 1.2 and 1.3.
To my mind, it makes sense, when a user requests OXM as the flow format,
to allow any protocol based on the OXM flow format to be used. Until this
commit, however, "OXM" was specifically OpenFlow 1.2, and "OpenFlow13" was
required to request OXM on OpenFlow 1.3.
This doesn't affect the behavior of any released version of Open vSwitch.
Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'utilities')
| -rw-r--r-- | utilities/ovs-ofctl.8.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in index 5e70dba5..5ac4f97e 100644 --- a/utilities/ovs-ofctl.8.in +++ b/utilities/ovs-ofctl.8.in @@ -1369,6 +1369,11 @@ registers. Open vSwitch 1.1 and later supports this flow format. This combines Nicira Extended match with the ability to place a flow in a specific table. Open vSwitch 1.2 and later supports this flow format. +. +.IP "\fBOXM-OpenFlow12\fR" +.IQ "\fBOXM-OpenFlow13\fR" +These are the standard OXM (OpenFlow Extensible Match) flow format in +OpenFlow 1.2 and 1.3, respectively. .RE . .IP @@ -1381,6 +1386,8 @@ Any supported flow format. \fBOpenFlow10\-table_id\fR or \fBOpenFlow10+table_id\fR. .IP "\fBNXM\fR" \fBNXM\-table_id\fR or \fBNXM+table_id\fR. +.IP "\fBOXM\fR" +\fBOXM-OpenFlow12\fR or \fBOXM-OpenFlow13\fR. .RE . .IP |