matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bridge: make -c match -compressvlans first instead of -color 

commit c7c1a1ef51 ("bridge: colorize output and use JSON print library")
broke previous use of -c to represent compressvlans. This restores
previous use of -c to represent compressvlans. Understand the original
motivation to use -c to represent color consistently everywhere but
there are apps and network interface managers out there that are already
using -c to prepresent compressed vlans.

Fixes: c7c1a1ef51 ("bridge: colorize output and use JSON print library")
Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Roopa Prabhu 2018-11-27 18:02:52 -08:00 committed by Stephen Hemminger
parent 2f4d834b99
commit f38e278b84
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/bridge.c
View File

@ -171,9 +171,9 @@ main(int argc, char **argv)
NEXT_ARG(); NEXT_ARG();
if (netns_switch(argv[1])) if (netns_switch(argv[1]))
exit(-1); exit(-1);
} else if (matches_color(opt, &color)) {
} else if (matches(opt, "-compressvlans") == 0) { } else if (matches(opt, "-compressvlans") == 0) {
++compress_vlans; ++compress_vlans;
} else if (matches_color(opt, &color)) {
} else if (matches(opt, "-force") == 0) { } else if (matches(opt, "-force") == 0) {
++force; ++force;
} else if (matches(opt, "-json") == 0) { } else if (matches(opt, "-json") == 0) {