Merge branch 'iproute2-master' into iproute2-next

[mirror_iproute2.git] / ip / iproute.c

diff --git a/ip/iproute.c b/ip/iproute.c
index 1326a6574fbed2668e8b92f2a6fffd6897ba4305..d347246925531ead5e7a6eb40e9bdbbfcb9b4bc2 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -83,7 +83,7 @@ static void usage(void)
                "INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ]...\n"
                "NH := [ encap ENCAPTYPE ENCAPHDR ] [ via [ FAMILY ] ADDRESS ]\n"
                "           [ dev STRING ] [ weight NUMBER ] NHFLAGS\n"
-               "FAMILY := [ inet | inet6 | ipx | dnet | mpls | bridge | link ]\n"
+               "FAMILY := [ inet | inet6 | mpls | bridge | link ]\n"
                "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ] [ as [ to ] ADDRESS ]\n"
                "           [ rtt TIME ] [ rttvar TIME ] [ reordering NUMBER ]\n"
                "           [ window NUMBER ] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"
@@ -346,7 +346,7 @@ static void print_rtax_features(FILE *fp, unsigned int features)
 
        if (features)
                print_0xhex(PRINT_ANY,
-                           "features", "0x%x ", of);
+                           "features", "%#llx ", of);
 }
 
 static void print_rt_flags(FILE *fp, unsigned int flags)
@@ -483,10 +483,10 @@ static void print_rta_cacheinfo(FILE *fp, const struct rta_cacheinfo *ci)
        }
        if (ci->rta_id)
                print_0xhex(PRINT_ANY, "ipid",
-                           "ipid 0x%04x ", ci->rta_id);
+                           "ipid 0x%04llx ", ci->rta_id);
        if (ci->rta_ts || ci->rta_tsage) {
                print_0xhex(PRINT_ANY, "ts",
-                           "ts 0x%x", ci->rta_ts);
+                           "ts 0x%llx", ci->rta_ts);
                print_uint(PRINT_ANY, "tsage",
                           "tsage %usec ", ci->rta_tsage);
        }
@@ -885,7 +885,7 @@ int print_route(struct nlmsghdr *n, void *arg)
                                print_uint(PRINT_JSON, "mark", NULL, mark);
                        else if (mark >= 16)
                                print_0xhex(PRINT_FP, NULL,
-                                           "mark 0x%x ", mark);
+                                           "mark 0x%llx ", mark);
                        else
                                print_uint(PRINT_FP, NULL,
                                           "mark %u ", mark);
@@ -923,15 +923,15 @@ int print_route(struct nlmsghdr *n, void *arg)
                print_rt_pref(fp, rta_getattr_u8(tb[RTA_PREF]));
 
        if (tb[RTA_TTL_PROPAGATE]) {
-               bool propogate = rta_getattr_u8(tb[RTA_TTL_PROPAGATE]);
+               bool propagate = rta_getattr_u8(tb[RTA_TTL_PROPAGATE]);
 
                if (is_json_context())
                        print_bool(PRINT_JSON, "ttl-propogate", NULL,
-                                  propogate);
+                                  propagate);
                else
                        print_string(PRINT_FP, NULL,
                                     "ttl-propogate %s",
-                                    propogate ? "enabled" : "disabled");
+                                    propagate ? "enabled" : "disabled");
        }
 
        print_string(PRINT_FP, NULL, "\n", NULL);