From ca339f23a48cc010afaf92e31d709d2c56953120 Mon Sep 17 00:00:00 2001 From: Packit Service Date: Feb 01 2021 08:37:03 +0000 Subject: Apply patch 0007-tc-mpls-fix-manpage-example-and-help-message-string.patch patch_name: 0007-tc-mpls-fix-manpage-example-and-help-message-string.patch present_in_specfile: true location_in_specfile: 7 --- diff --git a/man/man8/tc-mpls.8 b/man/man8/tc-mpls.8 index 9e563e9..7f8be22 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 2c3752b..9fee22e 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"