From: Roopa Prabhu <roopa@cumulusnetworks.com>
Date: Wed, 28 Nov 2018 02:02:52 +0000 (-0800)
Subject: bridge: make -c match -compressvlans first instead of -color
X-Git-Tag: v4.20.0~40
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f38e278b8446e0ebe10e8e889387bcc9b110c05d;p=thirdparty%2Fiproute2.git

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

commit c7c1a1ef51ae ("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: c7c1a1ef51ae ("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>
---

diff --git a/bridge/bridge.c b/bridge/bridge.c
index 389f1bd53..a3d8154be 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -171,9 +171,9 @@ main(int argc, char **argv)
 			NEXT_ARG();
 			if (netns_switch(argv[1]))
 				exit(-1);
-		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-compressvlans") == 0) {
 			++compress_vlans;
+		} else if (matches_color(opt, &color)) {
 		} else if (matches(opt, "-force") == 0) {
 			++force;
 		} else if (matches(opt, "-json") == 0) {