]> git.proxmox.com Git - mirror_iproute2.git/commitdiff
route: Fix printing of locked entries
authorPhil Sutter <phil@nwl.cc>
Sat, 12 Dec 2015 13:09:48 +0000 (14:09 +0100)
committerStephen Hemminger <shemming@brocade.com>
Fri, 18 Dec 2015 01:07:07 +0000 (17:07 -0800)
Commit 0f7543322c5fd ("route: ignore RTAX_HOPLIMIT of value -1")
accidentally reordered fprintf statements. This patch restores the
original ordering.

Fixes: 0f7543322c5fd ("route: ignore RTAX_HOPLIMIT of value -1")
Signed-off-by: Phil Sutter <phil@nwl.cc>
ip/iproute.c

index c42ea0b9ecb8e103297f3ca2da276f77415aaf66..4d86a596175f5294ecc136ea415b6186a753f68f 100644 (file)
@@ -577,8 +577,6 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                        if (mxrta[i] == NULL)
                                continue;
 
-                       if (mxlock & (1<<i))
-                               fprintf(fp, " lock");
                        if (i != RTAX_CC_ALGO)
                                val = rta_getattr_u32(mxrta[i]);
 
@@ -590,6 +588,9 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                        else
                                fprintf(fp, " metric %d", i);
 
+                       if (mxlock & (1<<i))
+                               fprintf(fp, " lock");
+
                        switch (i) {
                        case RTAX_FEATURES:
                                print_rtax_features(fp, val);