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

Merge branch 'master' into net-next

This commit is contained in:
Stephen Hemminger 2017-04-12 10:02:07 -07:00
parent 45f78b4dec 5551ed44d3
commit 19beb1aa16
1 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ip/iproute.c
View File

@ -677,6 +677,7 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
fprintf(fp, "%s", ll_index_to_name(nh->rtnh_ifindex)); fprintf(fp, "%s", ll_index_to_name(nh->rtnh_ifindex));
if (nh->rtnh_hops != 1) if (nh->rtnh_hops != 1)
fprintf(fp, "(ttl>%d)", nh->rtnh_hops); fprintf(fp, "(ttl>%d)", nh->rtnh_hops);
fprintf(fp, " ");
} else { } else {
fprintf(fp, "dev %s ", ll_index_to_name(nh->rtnh_ifindex)); fprintf(fp, "dev %s ", ll_index_to_name(nh->rtnh_ifindex));
if (r->rtm_family != AF_MPLS) if (r->rtm_family != AF_MPLS)