From: Phil Sutter <phil@nwl.cc>
Date: Wed, 15 Aug 2018 16:21:25 +0000 (+0200)
Subject: bridge: Fix check for colored output
X-Git-Tag: v4.19.0~84^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5332148debeadcf52cc157ef1dd0a377dd482517;p=thirdparty%2Fiproute2.git

bridge: Fix check for colored output

There is no point in calling enable_color() conditionally if it was
already called for each time '-color' flag was parsed. Align the
algorithm with that in ip and tc by actually making use of 'color'
variable.

Fixes: e9625d6aead11 ("Merge branch 'iproute2-master' into iproute2-next")
Signed-off-by: Phil Sutter <phil@nwl.cc>
Signed-off-by: David Ahern <dsahern@gmail.com>
---

diff --git a/bridge/bridge.c b/bridge/bridge.c
index 7fcfe1116..289a157d3 100644
--- a/bridge/bridge.c
+++ b/bridge/bridge.c
@@ -174,7 +174,7 @@ main(int argc, char **argv)
 			if (netns_switch(argv[1]))
 				exit(-1);
 		} else if (matches(opt, "-color") == 0) {
-			enable_color();
+			++color;
 		} else if (matches(opt, "-compressvlans") == 0) {
 			++compress_vlans;
 		} else if (matches(opt, "-force") == 0) {