|
 |
d62593 |
From cdb8197d0e7380b3679ded6bab398883aead92dc Mon Sep 17 00:00:00 2001
|
|
|
d62593 |
Message-Id: <cdb8197d0e7380b3679ded6bab398883aead92dc.1611877215.git.aclaudi@redhat.com>
|
|
|
d62593 |
In-Reply-To: <cb7ce51cc1abd7b98370b903ec96205ebfe48661.1611877215.git.aclaudi@redhat.com>
|
|
|
d62593 |
References: <cb7ce51cc1abd7b98370b903ec96205ebfe48661.1611877215.git.aclaudi@redhat.com>
|
|
|
d62593 |
From: Andrea Claudi <aclaudi@redhat.com>
|
|
|
d62593 |
Date: Fri, 29 Jan 2021 00:35:03 +0100
|
|
|
d62593 |
Subject: [PATCH] tc-vlan: fix help and error message strings
|
|
|
d62593 |
|
|
|
d62593 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1885770
|
|
|
d62593 |
Upstream Status: unknown commit 7c7a0fe0
|
|
|
d62593 |
|
|
|
d62593 |
commit 7c7a0fe0c81cdff258c4314c629d7a52ae331dc4
|
|
|
d62593 |
Author: Guillaume Nault <gnault@redhat.com>
|
|
|
d62593 |
Date: Mon Nov 2 11:59:46 2020 +0100
|
|
|
d62593 |
|
|
|
d62593 |
tc-vlan: fix help and error message strings
|
|
|
d62593 |
|
|
|
d62593 |
* "vlan pop" can be followed by a CONTROL keyword.
|
|
|
d62593 |
|
|
|
d62593 |
* Add missing space in error message.
|
|
|
d62593 |
|
|
|
d62593 |
Signed-off-by: Guillaume Nault <gnault@redhat.com>
|
|
|
d62593 |
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
|
|
d62593 |
---
|
|
|
d62593 |
tc/m_vlan.c | 4 ++--
|
|
|
d62593 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
d62593 |
|
|
|
d62593 |
diff --git a/tc/m_vlan.c b/tc/m_vlan.c
|
|
|
d62593 |
index e6b21330..57722b73 100644
|
|
|
d62593 |
--- a/tc/m_vlan.c
|
|
|
d62593 |
+++ b/tc/m_vlan.c
|
|
|
d62593 |
@@ -30,7 +30,7 @@ static const char * const action_names[] = {
|
|
|
d62593 |
static void explain(void)
|
|
|
d62593 |
{
|
|
|
d62593 |
fprintf(stderr,
|
|
|
d62593 |
- "Usage: vlan pop\n"
|
|
|
d62593 |
+ "Usage: vlan pop [CONTROL]\n"
|
|
|
d62593 |
" vlan push [ protocol VLANPROTO ] id VLANID [ priority VLANPRIO ] [CONTROL]\n"
|
|
|
d62593 |
" vlan modify [ protocol VLANPROTO ] id VLANID [ priority VLANPRIO ] [CONTROL]\n"
|
|
|
d62593 |
" vlan pop_eth [CONTROL]\n"
|
|
|
d62593 |
@@ -244,7 +244,7 @@ static int print_vlan(struct action_util *au, FILE *f, struct rtattr *arg)
|
|
|
d62593 |
parse_rtattr_nested(tb, TCA_VLAN_MAX, arg);
|
|
|
d62593 |
|
|
|
d62593 |
if (!tb[TCA_VLAN_PARMS]) {
|
|
|
d62593 |
- fprintf(stderr, "Missing vlanparameters\n");
|
|
|
d62593 |
+ fprintf(stderr, "Missing vlan parameters\n");
|
|
|
d62593 |
return -1;
|
|
|
d62593 |
}
|
|
|
d62593 |
parm = RTA_DATA(tb[TCA_VLAN_PARMS]);
|
|
|
d62593 |
--
|
|
|
d62593 |
2.29.2
|
|
|
d62593 |
|