From 8953735b551d5f3c18c9523ea24055f4a7f9b927 Mon Sep 17 00:00:00 2001 Message-Id: <8953735b551d5f3c18c9523ea24055f4a7f9b927.1611877215.git.aclaudi@redhat.com> In-Reply-To: References: From: Andrea Claudi Date: Fri, 29 Jan 2021 00:35:03 +0100 Subject: [PATCH] tc-mpls: fix manpage example and help message string Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1885770 Upstream Status: unknown commit 8682f588 commit 8682f588bfed7862233a22626562696d662ca60c Author: Guillaume Nault Date: Mon Nov 2 12:24:25 2020 +0100 tc-mpls: fix manpage example and help message string Manpage: * Remove the extra "and to ip packets" part from command description to make it more understandable. * Redirect packets to eth1, instead of eth0, as told in the description. Help string: * "mpls pop" can be followed by a CONTROL keyword. * "mpls modify" can also set the MPLS_BOS field. Signed-off-by: Guillaume Nault Signed-off-by: Stephen Hemminger --- man/man8/tc-mpls.8 | 6 +++--- tc/m_mpls.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/man/man8/tc-mpls.8 b/man/man8/tc-mpls.8 index 9e563e98..7f8be221 100644 --- a/man/man8/tc-mpls.8 +++ b/man/man8/tc-mpls.8 @@ -147,15 +147,15 @@ a label 123 and sends them out eth1: .EE .RE -In this example, incoming MPLS unicast packets on eth0 are decapsulated and to -ip packets and output to eth1: +In this example, incoming MPLS unicast packets on eth0 are decapsulated +and redirected to eth1: .RS .EX #tc qdisc add dev eth0 handle ffff: ingress #tc filter add dev eth0 protocol mpls_uc parent ffff: flower \\ action mpls pop protocol ipv4 \\ - action mirred egress redirect dev eth0 + action mirred egress redirect dev eth1 .EE .RE diff --git a/tc/m_mpls.c b/tc/m_mpls.c index 2c3752ba..9fee22e3 100644 --- a/tc/m_mpls.c +++ b/tc/m_mpls.c @@ -23,12 +23,13 @@ static const char * const action_names[] = { static void explain(void) { fprintf(stderr, - "Usage: mpls pop [ protocol MPLS_PROTO ]\n" + "Usage: mpls pop [ protocol MPLS_PROTO ] [CONTROL]\n" " mpls push [ protocol MPLS_PROTO ] [ label MPLS_LABEL ] [ tc MPLS_TC ]\n" " [ ttl MPLS_TTL ] [ bos MPLS_BOS ] [CONTROL]\n" " mpls mac_push [ protocol MPLS_PROTO ] [ label MPLS_LABEL ] [ tc MPLS_TC ]\n" " [ ttl MPLS_TTL ] [ bos MPLS_BOS ] [CONTROL]\n" - " mpls modify [ label MPLS_LABEL ] [ tc MPLS_TC ] [ ttl MPLS_TTL ] [CONTROL]\n" + " mpls modify [ label MPLS_LABEL ] [ tc MPLS_TC ] [ ttl MPLS_TTL ]\n" + " [ bos MPLS_BOS ] [CONTROL]\n" " for pop, MPLS_PROTO is next header of packet - e.g. ip or mpls_uc\n" " for push and mac_push, MPLS_PROTO is one of mpls_uc or mpls_mc\n" " with default: mpls_uc\n" -- 2.29.2