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 <gnault@redhat.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/man/man8/tc-mpls.8 b/man/man8/tc-mpls.8
index 9e563e98d0c6f6e303c66d9119a24d661be3da24..7f8be2212fb23e16f72d11b5c06773d115178fe8 100644 (file)
--- 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 2c3752bace7481e58ce465ba8b8a51e37fc9f371..9fee22e35116b03be9cbd4e6f88fa74e4cf62915 100644 (file)
--- 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"