gre/gre6: Post merge fixes
Subsystems (2)
PATCH 1/1 gre/gre6: Post merge fixes
Few minor changes after merge of 'master' into 'net-next' branch:
1) Follow 80 line length for printing erspan_index parameter as we did in master with commit 2a8d0f6e9c3f ("gre/tunnel:
Print erspan_index using print_uint()").
2) Remove remnants of encapsulation option printing: now it is done using tnl_print_encap() helper in commit bad76e6b1f44 ("ip/tunnel: Abstract tunnel encapsulation options printing").
--- ip/link_gre.c | 3 ++- ip/link_gre6.c | 46 ++-------------------------------------------- 2 files changed, 4 insertions(+), 45 deletions(-)
ip/link_gre.c +2 -1
@@ -506,7 +506,8 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])if (tb[IFLA_GRE_ERSPAN_INDEX ]) {__u32 erspan_idx =rta_getattr_u32 (tb[IFLA_GRE_ERSPAN_INDEX ]); -print_uint (PRINT_ANY ,"erspan_index" ,"erspan_index %u " , erspan_idx); +print_uint (PRINT_ANY , +"erspan_index" ,"erspan_index %u " , erspan_idx); }if (tb[IFLA_GRE_ERSPAN_VER ]) {
ip/link_gre6.c +2 -44
58 lines not on this page · raw message
Signature · 1 line
1.7.10.4
David Ahern
AppliedQuoted 10 lines · Serhey Popovych
Few minor changes after merge of 'master' into 'net-next' branch:
1) Follow 80 line length for printing
erspan_indexparameter as we did in master with commit2a8d0f6e9c3f("gre/tunnel:erspan_indexusingprint_uint()").2) Remove remnants of encapsulation option printing: now it is done using
tnl_print_encap()helper in commitbad76e6b1f44("ip/tunnel: Abstract tunnel encapsulation options printing").
Quoted 7 lines
Fixes 8c75f69411bc ("Merge branch 'master' into net-next")Signed-off-by Serhey Popovych <[email protected]>--- ip/link_gre.c | 3 ++- ip/link_gre6.c | 46 ++-------------------------------------------- 2 files changed, 4 insertions(+), 45 deletions(-)
Applied.