matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

route: Fix printing of locked entries 

Commit 0f7543322c ("route: ignore RTAX_HOPLIMIT of value -1")
accidentally reordered fprintf statements. This patch restores the
original ordering.

Fixes: 0f7543322c ("route: ignore RTAX_HOPLIMIT of value -1")
Signed-off-by: Phil Sutter <phil@nwl.cc>
This commit is contained in:
Phil Sutter 2015-12-12 14:09:48 +01:00 committed by Stephen Hemminger
parent e834eb8eba
commit ed6b8652f7
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ip/iproute.c
View File

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