diff mbox series

[iproute2] tc-vlan: fix help and error message strings

Message ID d135c4b67496e00dbb4ad91f5a38feee2d4ea075.1604314759.git.gnault@redhat.com
State Accepted
Delegated to: stephen hemminger
Headers show
Series [iproute2] tc-vlan: fix help and error message strings | expand

Checks

Context Check Description
jkicinski/tree_selection success Not a local patch

Commit Message

Guillaume Nault Nov. 2, 2020, 10:59 a.m. UTC 
* "vlan pop" can be followed by a CONTROL keyword.

 * Add missing space in error message.

Signed-off-by: Guillaume Nault <gnault@redhat.com>
---
 tc/m_vlan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Stephen Hemminger Nov. 8, 2020, 6:48 p.m. UTC | #1 
On Mon, 2 Nov 2020 11:59:46 +0100
Guillaume Nault <gnault@redhat.com> wrote:

>  * "vlan pop" can be followed by a CONTROL keyword.
> 
>  * Add missing space in error message.
> 
> Signed-off-by: Guillaume Nault <gnault@redhat.com>

Applied, thanks
diff mbox series

Patch

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]);