From: Phil Sutter <phil@nwl.cc>
Date: Sat, 12 Dec 2015 13:09:48 +0000 (+0100)
Subject: route: Fix printing of locked entries
X-Git-Tag: v4.4.0~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed6b8652f7d5470cac7fd763b4a47d07a3a0bfb6;p=thirdparty%2Fiproute2.git

route: Fix printing of locked entries

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>
---

diff --git a/ip/iproute.c b/ip/iproute.c
index c42ea0b9e..4d86a5961 100644
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -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);