]> git.proxmox.com Git - mirror_iproute2.git/commit
gre/gre6: Post merge fixes
authorSerhey Popovych <serhe.popovych@gmail.com>
Mon, 22 Jan 2018 14:50:08 +0000 (16:50 +0200)
committerDavid Ahern <dsahern@gmail.com>
Mon, 22 Jan 2018 17:30:09 +0000 (09:30 -0800)
commit3cb92eb9ab9f6a13015a1427b163f320c8c84b6f
tree9fcdd360a68609784d80a1a89b6e5f4e8067f579
parentc2e368df0a12eef89dbb1dd06eda9a6bbb478dc4
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").

Fixes: 8c75f69411bc ("Merge branch 'master' into net-next")
Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com>
ip/link_gre.c
ip/link_gre6.c