From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roopa Prabhu Subject: [PATCH iproute2] bridge: make -c match -compressvlans first instead of -color Date: Tue, 27 Nov 2018 18:02:52 -0800 Message-ID: <1543370572-19373-1-git-send-email-roopa@cumulusnetworks.com> Cc: netdev@vger.kernel.org, dsa@cumulusnetworks.com, nikolay@cumulusnetworks.com, julien@cumulusnetworks.com To: stephen@networkplumber.org Return-path: Received: from mail-pl1-f194.google.com ([209.85.214.194]:40393 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726567AbeK1NC7 (ORCPT ); Wed, 28 Nov 2018 08:02:59 -0500 Received: by mail-pl1-f194.google.com with SMTP id u18so3990224plq.7 for ; Tue, 27 Nov 2018 18:03:07 -0800 (PST) Sender: netdev-owner@vger.kernel.org List-ID: From: Roopa Prabhu 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 --- bridge/bridge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge/bridge.c b/bridge/bridge.c index 389f1bd..a3d8154 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) { -- 2.1.4