Message ID | 20220210125715.54568-1-wojciech.drewek@intel.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 4f015972988a5f5d74e1f5f6435d08506eedca15 |
Delegated to: | David Ahern |
Headers | show |
Series | [iproute2-next,v2] f_flower: fix indentation for enc_key_id and u32 | expand |
Context | Check | Description |
---|---|---|
netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to iproute2/iproute2-next.git (main) by David Ahern <dsahern@kernel.org>: On Thu, 10 Feb 2022 13:57:15 +0100 you wrote: > Commit b2450e46b7b2 ("flower: fix clang warnings") caused enc_key_id > and u32 to be printed without indentation. Fix this by printing two > spaces before calling print_uint_name_value. > > Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com> > --- > v2: use unsigned int instead of uint in print_uint_indent_name_value > > [...] Here is the summary with links: - [iproute2-next,v2] f_flower: fix indentation for enc_key_id and u32 https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/commit/?id=4f015972988a You are awesome, thank you!
diff --git a/tc/f_flower.c b/tc/f_flower.c index 1ff8341d27a6..6c1d0df62255 100644 --- a/tc/f_flower.c +++ b/tc/f_flower.c @@ -109,6 +109,12 @@ static void print_indent_name_value(const char *name, const char *value) print_string_name_value(name, value); } +static void print_uint_indent_name_value(const char *name, unsigned int value) +{ + print_string(PRINT_FP, NULL, " ", NULL); + print_uint_name_value(name, value); +} + static int flower_parse_eth_addr(char *str, int addr_type, int mask_type, struct nlmsghdr *n) { @@ -2324,7 +2330,7 @@ static void flower_print_key_id(const char *name, struct rtattr *attr) return; print_nl(); - print_uint_name_value(name, rta_getattr_be32(attr)); + print_uint_indent_name_value(name, rta_getattr_be32(attr)); } static void flower_print_geneve_opts(const char *name, struct rtattr *attr, @@ -2573,7 +2579,7 @@ static void flower_print_u32(const char *name, struct rtattr *attr) return; print_nl(); - print_uint_name_value(name, rta_getattr_u32(attr)); + print_uint_indent_name_value(name, rta_getattr_u32(attr)); } static void flower_print_mpls_opt_lse(struct rtattr *lse)
Commit b2450e46b7b2 ("flower: fix clang warnings") caused enc_key_id and u32 to be printed without indentation. Fix this by printing two spaces before calling print_uint_name_value. Signed-off-by: Wojciech Drewek <wojciech.drewek@intel.com> --- v2: use unsigned int instead of uint in print_uint_indent_name_value --- tc/f_flower.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)