| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.18 105/145] vti6: return GRE_KEY for vti6 | Date | Sun, 16 Apr 2017 12:49:58 +0200 |
| |
3.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Forster <dforster@brocade.com>
commit 7dcdf941cdc96692ab99fd790c8cc68945514851 upstream.
Align vti6 with vti by returning GRE_KEY flag. This enables iproute2 to display tunnel keys on "ip -6 tunnel show"
Signed-off-by: David Forster <dforster@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- net/ipv6/ip6_vti.c | 4 ++++ 1 file changed, 4 insertions(+)
--- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c @@ -645,6 +645,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 * u->link = p->link; u->i_key = p->i_key; u->o_key = p->o_key; + if (u->i_key) + u->i_flags |= GRE_KEY; + if (u->o_key) + u->o_flags |= GRE_KEY; u->proto = p->proto; memcpy(u->name, p->name, sizeof(u->name));
|