* [iproute PATCH] route: Fix printing of locked entries
@ 2015-12-12 13:09 Phil Sutter
2015-12-18 1:15 ` Stephen Hemminger
0 siblings, 1 reply; 2+ messages in thread
From: Phil Sutter @ 2015-12-12 13:09 UTC (permalink / raw)
To: Stephen Hemminger; +Cc: netdev
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 | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ip/iproute.c b/ip/iproute.c
index c42ea0b9ecb8e..4d86a596175f5 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);
--
2.6.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [iproute PATCH] route: Fix printing of locked entries
2015-12-12 13:09 [iproute PATCH] route: Fix printing of locked entries Phil Sutter
@ 2015-12-18 1:15 ` Stephen Hemminger
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Hemminger @ 2015-12-18 1:15 UTC (permalink / raw)
To: Phil Sutter; +Cc: netdev
On Sat, 12 Dec 2015 14:09:48 +0100
Phil Sutter <phil@nwl.cc> wrote:
> 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>
Applied
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-18 1:15 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-12 13:09 [iproute PATCH] route: Fix printing of locked entries Phil Sutter
2015-12-18 1:15 ` Stephen Hemminger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).