tc: f_u32: allow skip_hw and skip_sw flags to be last

u32 uses NEXT_ARG() incorrectly when parsing skip_hw and skip_sw
flags.  NEXT_ARG() ensures there is another argument on the command
line, and is used in handling <keyword> <value> syntax to move past
<keyword> and ensure there is a <value> to read.

Commit 5e5b3008d1fb ("tc: f_u32: Add support for skip_hw and skip_sw
flags") seems to have copy pasted the handling from the previous
command - "police", which needs an extra parameter and is kind of
special due to the use of parse_police() helper.

The combination of NEXT_ARG() and continue worked fine as long as
skip_sw/skip_hw wasn't last, e.g.:

$ tc filter add dev dummy0 ingress prio 101 protocol ipv6 \
    u32 match ip6 priority 0xa0 0xe0 skip_hw action pass

But would fail if it was last:

$ tc filter add dev dummy0 ingress prio 101 protocol ipv6 \
    u32 match ip6 priority 0xa0 0xe0 flowid :1 skip_hw
Command line is not complete. Try option "help"

Remove the NEXT_ARG()s and the continues, and let the argc--; argv++;
at the end of the loop do its job.

Fixes: 5e5b3008d1fb ("tc: f_u32: Add support for skip_hw and skip_sw flags")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/tc/f_u32.c b/tc/f_u32.c
index bff4be6377289a87cc1d2b2e7b3e38a81b0feaac..e0a322d5a11c891107b95520ce480a50b41b689a 100644 (file)
--- a/tc/f_u32.c
+++ b/tc/f_u32.c
@@ -1147,13 +1147,9 @@ static int u32_parse_opt(struct filter_util *qu, char *handle,
                        terminal_ok++;
                        continue;
                } else if (strcmp(*argv, "skip_hw") == 0) {
-                       NEXT_ARG();
                        flags |= TCA_CLS_FLAGS_SKIP_HW;
-                       continue;
                } else if (strcmp(*argv, "skip_sw") == 0) {
-                       NEXT_ARG();
                        flags |= TCA_CLS_FLAGS_SKIP_SW;
-                       continue;
                } else if (strcmp(*argv, "help") == 0) {
                        explain();
                        return -1;