]> git.ipfire.org Git - thirdparty/iproute2.git/commitdiff
ip: change format of promiscuity display
authorStephen Hemminger <stephen@networkplumber.org>
Tue, 5 Feb 2013 16:16:28 +0000 (08:16 -0800)
committerStephen Hemminger <stephen@networkplumber.org>
Tue, 5 Feb 2013 16:16:28 +0000 (08:16 -0800)
Don't put it on separate line, keep it on line with link address.

ip/ipaddress.c

index e8cab40928c1ccc7023b17f484e9a6cc5db39bea..297506d40a84d33506989f234bbb7961341ddf3f 100644 (file)
@@ -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]));