git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 'master' into 'next'.
[sliver-openvswitch.git]
/
utilities
/
ovs-ofctl.8.in
diff --git
a/utilities/ovs-ofctl.8.in
b/utilities/ovs-ofctl.8.in
index
7452e70
..
06d61de
100644
(file)
--- a/
utilities/ovs-ofctl.8.in
+++ b/
utilities/ovs-ofctl.8.in
@@
-775,11
+775,6
@@
increasing capability:
This is the standard OpenFlow 1.0 flow format. It should be supported
by all OpenFlow switches.
.
This is the standard OpenFlow 1.0 flow format. It should be supported
by all OpenFlow switches.
.
-.IP "\fBtun_id_from_cookie\fR"
-This Nicira extension to OpenFlow adds minimal and limited support for
-\fBtun_id\fR, but it does not support any other Nicira flow
-extensions. (This flow format is deprecated.)
-.
.IP "\fBnxm\fR (Nicira Extended Match)"
This Nicira extension to OpenFlow is flexible and extensible. It
supports all of the Nicira flow extensions, such as \fBtun_id\fR and
.IP "\fBnxm\fR (Nicira Extended Match)"
This Nicira extension to OpenFlow is flexible and extensible. It
supports all of the Nicira flow extensions, such as \fBtun_id\fR and