36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
|
From 02a126e40fce4fe03fdc9ce39bd3d9ff20dd1fb0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Phil Sutter <phil@nwl.cc>
|
||
|
|
Date: Wed, 15 Aug 2018 18:21:25 +0200
|
||
|
|
Subject: [PATCH] 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>
|
||
|
|
(cherry picked from commit 5332148debeadcf52cc157ef1dd0a377dd482517)
|
||
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
||
|
|
---
|
||
|
|
bridge/bridge.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/bridge/bridge.c b/bridge/bridge.c
|
||
|
|
index 7fcfe1116f6e5..289a157d37f03 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) {
|
||
|
|
--
|
||
|
|
2.18.0
|
||
|
|
|