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