From: Stephen Hemminger <sthemmin@microsoft.com>
Date: Tue, 20 Feb 2018 19:08:46 +0000 (-0800)
Subject: ip: don't colorize the master device
X-Git-Tag: v4.17.0~78
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b68b361b4bf1ec18655a3bed112623c81e475aa6;p=thirdparty%2Fiproute2.git

ip: don't colorize the master device

Putting whole string "master eth0" in the interface name color
is wrong and confusing. Let's just turn color off for all attributes
of device.

Fixes: d92cc2d087b0 ("ipaddress: ll_map: Replace ll_idx_n2a() with ll_index_to_name()")
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
---

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 138045398..768e2ed27 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -888,11 +888,9 @@ int print_linkinfo(const struct sockaddr_nl *who,
 	if (tb[IFLA_MASTER]) {
 		int master = rta_getattr_u32(tb[IFLA_MASTER]);
 
-		print_color_string(PRINT_ANY,
-				   COLOR_IFNAME,
-				   "master",
-				   "master %s ",
-				   ll_index_to_name(master));
+		print_string(PRINT_ANY,
+			     "master", "master %s ",
+			     ll_index_to_name(master));
 	}
 
 	if (tb[IFLA_OPERSTATE])