From: Stephen Hemminger <stephen@networkplumber.org>
Date: Tue, 5 Feb 2013 16:16:28 +0000 (-0800)
Subject: ip: change format of promiscuity display
X-Git-Tag: v3.8.0~3^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1cb6a110d676cb261bedf2ba0103209fcbbc4367;p=thirdparty%2Fiproute2.git

ip: change format of promiscuity display

Don't put it on separate line, keep it on line with link address.
---

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index e8cab4092..297506d40 100644
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -461,13 +461,13 @@ int print_linkinfo(const struct sockaddr_nl *who,
 		}
 	}
 
-	if (do_link && tb[IFLA_LINKINFO] && show_details)
-		print_linktype(fp, tb[IFLA_LINKINFO]);
-
 	if (do_link && tb[IFLA_PROMISCUITY] && show_details)
-		fprintf(fp, "\n    promiscuity %u ",
+		fprintf(fp, " promiscuity %u ",
 			*(int*)RTA_DATA(tb[IFLA_PROMISCUITY]));
 
+	if (do_link && tb[IFLA_LINKINFO] && show_details)
+		print_linktype(fp, tb[IFLA_LINKINFO]);
+
 	if (do_link && tb[IFLA_IFALIAS])
 		fprintf(fp,"\n    alias %s", 
 			rta_getattr_str(tb[IFLA_IFALIAS]));