diff mbox series

[ovs-dev] ovs-ofctl: Update documentation for MPLS actions.

Message ID 20181023162628.30916-1-blp@ovn.org
State Accepted
Headers show
Series [ovs-dev] ovs-ofctl: Update documentation for MPLS actions. | expand

Commit Message

Ben Pfaff Oct. 23, 2018, 4:26 p.m. UTC 
Reported-by: lidejun <lidejun1@huawei.com>
Signed-off-by: Ben Pfaff <blp@ovn.org>
---
 utilities/ovs-ofctl.8.in | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

Comments

Justin Pettit Oct. 23, 2018, 9 p.m. UTC | #1 
> On Oct 23, 2018, at 9:26 AM, Ben Pfaff <blp@ovn.org> wrote:
> 
> Reported-by: lidejun <lidejun1@huawei.com>
> Signed-off-by: Ben Pfaff <blp@ovn.org>

Acked-by: Justin Pettit <jpettit@ovn.org>

--Justin
Ben Pfaff Oct. 26, 2018, 10:05 p.m. UTC | #2 
On Tue, Oct 23, 2018 at 02:00:20PM -0700, Justin Pettit wrote:
> 
> > On Oct 23, 2018, at 9:26 AM, Ben Pfaff <blp@ovn.org> wrote:
> > 
> > Reported-by: lidejun <lidejun1@huawei.com>
> > Signed-off-by: Ben Pfaff <blp@ovn.org>
> 
> Acked-by: Justin Pettit <jpettit@ovn.org>

Thanks, applied to master.
diff mbox series

Patch

diff --git a/utilities/ovs-ofctl.8.in b/utilities/ovs-ofctl.8.in
index aefea16ee34d..659406de57b4 100644
--- a/utilities/ovs-ofctl.8.in
+++ b/utilities/ovs-ofctl.8.in
@@ -922,17 +922,11 @@  its TTL is copied from the IP TTL (64 if the packet is not IP).
 If the packet does already contain an MPLS label, pushes a new
 outermost label as a copy of the existing outermost label.
 .IP
-A limitation of the implementation is that processing of actions will stop
-if \fBpush_mpls\fR follows another \fBpush_mpls\fR unless there is a
-\fBpop_mpls\fR in between.
+OVS currently supports at most 3 MPLS labels.
 .
 .IP \fBpop_mpls\fR:\fIethertype\fR
-Strips the outermost MPLS label stack entry.
-Currently the implementation restricts \fIethertype\fR to a non-MPLS Ethertype
-and thus \fBpop_mpls\fR should only be applied to packets with
-an MPLS label stack depth of one. A further limitation is that processing of
-actions will stop if \fBpop_mpls\fR follows another \fBpop_mpls\fR unless
-there is a \fBpush_mpls\fR in between.
+Strips the outermost MPLS label stack entry and changes the packet's
+Ethertype to \fIethertype\fR.
 .
 .IP \fBmod_dl_src\fB:\fImac\fR
 Sets the source Ethernet address to \fImac\fR.