diff options
| author | David Ahern <dsahern@kernel.org> | 2023-02-07 09:08:37 -0700 |
|---|---|---|
| committer | David Ahern <dsahern@kernel.org> | 2023-02-07 09:08:37 -0700 |
| commit | 65e09a46868a82c8bc844b663ea1b6a1b465dcc4 (patch) | |
| tree | 8acf0de752e149f1063f3f0ed366bce816211963 | |
| parent | 6035995665b7845c8ddf2c3a44f46c283f26f449 (diff) | |
| parent | d8070310fe159e26717b83ddb98c43da5642bd69 (diff) | |
| download | iproute2-65e09a46868a82c8bc844b663ea1b6a1b465dcc4.tar.gz | |
Merge branch 'main' into next
Signed-off-by: David Ahern <dsahern@kernel.org>
| -rw-r--r-- | ip/ipmacsec.c | 8 | ||||
| -rw-r--r-- | man/man8/ip-rule.8 | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c index 8da7c3d3..8b0d5666 100644 --- a/ip/ipmacsec.c +++ b/ip/ipmacsec.c @@ -938,8 +938,8 @@ static void print_tx_sc(const char *prefix, __u64 sci, __u8 encoding_sa, print_uint(PRINT_ANY, "an", "%d:", rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_AN])); if (is_xpn) { - print_uint(PRINT_ANY, "pn", " PN %u,", - rta_getattr_u64(sa_attr[MACSEC_SA_ATTR_PN])); + print_lluint(PRINT_ANY, "pn", " PN %llu,", + rta_getattr_u64(sa_attr[MACSEC_SA_ATTR_PN])); print_0xhex(PRINT_ANY, "ssci", "SSCI %08x", ntohl(rta_getattr_u32(sa_attr[MACSEC_SA_ATTR_SSCI]))); @@ -1015,8 +1015,8 @@ static void print_rx_sc(const char *prefix, __be64 sci, __u8 active, print_uint(PRINT_ANY, "an", "%u:", rta_getattr_u8(sa_attr[MACSEC_SA_ATTR_AN])); if (is_xpn) { - print_uint(PRINT_ANY, "pn", " PN %u,", - rta_getattr_u64(sa_attr[MACSEC_SA_ATTR_PN])); + print_lluint(PRINT_ANY, "pn", " PN %llu,", + rta_getattr_u64(sa_attr[MACSEC_SA_ATTR_PN])); print_0xhex(PRINT_ANY, "ssci", "SSCI %08x", ntohl(rta_getattr_u32(sa_attr[MACSEC_SA_ATTR_SSCI]))); diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8 index 2c12bf64..743d88c6 100644 --- a/man/man8/ip-rule.8 +++ b/man/man8/ip-rule.8 @@ -15,7 +15,7 @@ ip-rule \- routing policy database management .ti -8 .B ip rule -.RB "[ " list +.RB "[ " show .RI "[ " SELECTOR " ]]" .ti -8 @@ -42,8 +42,8 @@ ip-rule \- routing policy database management .IR STRING " ] [ " .B oif .IR STRING " ] [ " -.B pref -.IR NUMBER " ] [ " +.B priority +.IR PREFERENCE " ] [ " .IR l3mdev " ] [ " .B uidrange .IR NUMBER "-" NUMBER " ] [ " |