| Message ID | 1449925788-30736-1-git-send-email-phil@nwl.cc |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
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 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);
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(-)