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

diff --git a/tc/m_vlan.c b/tc/m_vlan.c
index e6b21330a05a6407bfe79678da464f8d4a0fa09a..57722b73a2d11ed30b95b591145f2fecbce48704 100644 (file)
--- 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]);